diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-05 11:34:53 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-05 11:37:10 -0400 |
| commit | 9626ffbf14981b7ab618ef85a8ef6ee917d13df4 (patch) | |
| tree | 25cffd5bbd0bb6e5e86b0ba0671867c8f4314fd7 /pkgs/misc/my-env | |
| parent | 252b36a28db1dd9036cfcbfbaa64b63e6ea5655a (diff) | |
myEnv: stdenv doesn't mangle dependencies like that anymore
Diffstat (limited to 'pkgs/misc/my-env')
| -rw-r--r-- | pkgs/misc/my-env/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 13102877d7e7..aec79f1c5cf5 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -62,11 +62,7 @@ , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}: mkDerivation { - # The setup.sh script from stdenv will expect the native build inputs in - # the nativeBuildInputs environment variable. - nativeBuildInputs = [ ] ++ buildInputs; - # Trick to bypass the stdenv usual change of propagatedBuildInputs => propagatedNativeBuildInputs - propagatedBuildInputs2 = propagatedBuildInputs; + inherit buildInputs propagatedBuildInputs; name = "env-${name}"; phases = [ "buildPhase" "fixupPhase" ]; @@ -89,8 +85,8 @@ mkDerivation { "$setupNew" > "$s" cat >> "$out/dev-envs/''${name/env-/}" << EOF defaultNativeBuildInputs="$defaultNativeBuildInputs" - nativeBuildInputs="$nativeBuildInputs" - propagatedBuildInputs="$propagatedBuildInputs2" + buildInputs="$buildInputs" + propagatedBuildInputs="$propagatedBuildInputs" # the setup-new script wants to write some data to a temp file.. so just let it do that and tidy up afterwards tmp="\$("${pkgs.coreutils}/bin/mktemp" -d)" NIX_BUILD_TOP="\$tmp" |