git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #63701 from basvandijk/composable-mkshell-shellHook

Improve composability of mkShell

commit7f7687e79f4237fd405b97641c4d860a7190e46b authorzimbatm <zimbatm@zimbatm.com> dateSun 23 Jun 2019, 22:39 (7 years ago) parent852d81dcee3573
1 file changed+6−7
pkgs/build-support/mkshell/default.nix+6−7
pkgs/build-support/mkshell/default.nix+6−7
@@ -11,13 +11,8 @@
1111 ...
1212}@attrs:
1313let
14− mergeInputs = name:
15− let
16− op = item: sum: sum ++ item."${name}" or [];
17− nul = [];
18− list = [attrs] ++ inputsFrom;
19− in
20− lib.foldr op nul list;
14+ mergeInputs = name: lib.concatLists (lib.catAttrs name
15+ ([attrs] ++ inputsFrom));
2116
2217 rest = builtins.removeAttrs attrs [
2318 "inputsFrom"
@@ -25,6 +20,7 @@ let
2520 "nativeBuildInputs"
2621 "propagatedBuildInputs"
2722 "propagatedNativeBuildInputs"
23+ "shellHook"
2824 ];
2925in
3026
@@ -37,6 +33,9 @@ stdenv.mkDerivation ({
3733 propagatedBuildInputs = mergeInputs "propagatedBuildInputs";
3834 propagatedNativeBuildInputs = mergeInputs "propagatedNativeBuildInputs";
3935
36+ shellHook = lib.concatStringsSep "\n" (lib.catAttrs "shellHook"
37+ (lib.reverseList inputsFrom ++ [attrs]));
38+
4039 nobuildPhase = ''
4140 echo
4241 echo "This derivation is not meant to be built, aborting";