Skip to content

Commit

Permalink
use buildEnv instead of joinsymlinks
Browse files Browse the repository at this point in the history
buildEnv respects propagatedUserEnvPkgs
  • Loading branch information
markuskowa committed Oct 27, 2024
1 parent bfb9157 commit f19736f
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
6 changes: 0 additions & 6 deletions lib.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,4 @@
pkgs-by-name = callPackage: dir:
lib.mapAttrs (pkg: _: callPackage (dir + "/${pkg}/package.nix") {})
(lib.filterAttrs (_: type: type == "directory") (builtins.readDir dir));

buildEnvMpi = symlinkJoin: input:
symlinkJoin {
inherit (input) name;
paths = lib.flatten (map(x: if x ? passthru.mpi then [ x x.passthru.mpi ] else x) input.paths);
};
}
1 change: 0 additions & 1 deletion overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ let

inherit callPackage;
inherit aggressiveStdenv;
inherit qlib;

#
# Upstream overrides
Expand Down
2 changes: 1 addition & 1 deletion template/qc/nix/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
# EDITME
# Add packages to the default package as you wish
packages."${system}" = (filterDrvs pkgs.qchem) // {
default = pkgs.qchem.qlib.buildEnvMpi pkgs.symlinkJoin {
default = pkgs.buildEnv {
name = "quantum-chemistry";
paths = [
# put a list of packages here. e.g.:
Expand Down

0 comments on commit f19736f

Please sign in to comment.