mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-16 18:37:04 +03:00
Updating myEnv for the new crossCompiling stdenv, so it puts in the environment buildNativeInputs
and not builtInputs. svn path=/nixpkgs/branches/stdenv-updates/; revision=19078
This commit is contained in:
parent
3e10ba6bb9
commit
bed103ef53
@ -62,7 +62,7 @@ mkDerivation {
|
|||||||
-e 's@trap.*@@' \
|
-e 's@trap.*@@' \
|
||||||
-i "$s"
|
-i "$s"
|
||||||
cat >> "$out/dev-envs/''${name/env-/}" << EOF
|
cat >> "$out/dev-envs/''${name/env-/}" << EOF
|
||||||
buildInputs="$buildInputs"
|
buildInputs="$buildNativeInputs"
|
||||||
# the setup-new script wants to write some data to a temp file.. so just let it do that and tidy up afterwards
|
# 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)"
|
tmp="\$("${pkgs.coreutils}/bin/mktemp" -d)"
|
||||||
NIX_BUILD_TOP="\$tmp"
|
NIX_BUILD_TOP="\$tmp"
|
||||||
|
Loading…
Reference in New Issue
Block a user