summaryrefslogtreecommitdiffstats
path: root/pkgs/misc/my-env
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/misc/my-env')
-rw-r--r--pkgs/misc/my-env/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 34a21a7e37b7..7c6c2d462393 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -41,7 +41,9 @@
{ mkDerivation, substituteAll, pkgs } : { stdenv ? pkgs.stdenv, name, buildInputs ? [], cTags ? [], extraCmds ? ""} :
mkDerivation {
- buildInputs = [ ] ++ buildInputs ;
+ # The setup.sh script from stdenv will expect the native build inputs in
+ # the buildNativeInputs environment variable.
+ buildNativeInputs = [ ] ++ buildInputs ;
name = "env-${name}";
phases = "buildPhase";
setupNew = substituteAll {
@@ -62,7 +64,7 @@ mkDerivation {
-e 's@trap.*@@' \
-i "$s"
cat >> "$out/dev-envs/''${name/env-/}" << EOF
- buildInputs="$buildNativeInputs"
+ buildNativeInputs="$buildNativeInputs"
# 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"