diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-22 15:00:15 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-22 15:00:15 +0000 |
| commit | fedf79faeae90192ea83d9dfb15f252a23ece27e (patch) | |
| tree | 828dcf64deda83d72600da6dbad9266a89e9d4d1 /pkgs/misc/my-env | |
| parent | 94ed14ccef2638055ceee46f88d17698ef1e262f (diff) | |
Fixing 'my-env' on stdenv-updates, considering that users will add
'buildInputs' to its mkDerivation parameter, while the stdenv setup.sh script
would expect buildNativeInputs.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19615
Diffstat (limited to 'pkgs/misc/my-env')
| -rw-r--r-- | pkgs/misc/my-env/default.nix | 6 |
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" |