suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Fix my-env so it includes gcc, as it used to do.

Browse Source 
This is a reaction to 1014620bce, that
moved some paths from nix source to the builder.sh of stdenv.

(cherry picked from commit 263c13481c)
This commit is contained in:
Lluís Batlle i Rossell 2015-09-24 14:55:14 +02:00
parent f01ac81a8f
commit fc80b21fd6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/my-env/default.nix
View File

@ -64,7 +64,7 @@
mkDerivation { mkDerivation {
# The setup.sh script from stdenv will expect the native build inputs in # The setup.sh script from stdenv will expect the native build inputs in
# the nativeBuildInputs environment variable. # the nativeBuildInputs environment variable.
nativeBuildInputs = [ ] ++ buildInputs; nativeBuildInputs = stdenv.defaultNativeBuildInputs ++ buildInputs;
# Trick to bypass the stdenv usual change of propagatedBuildInputs => propagatedNativeBuildInputs # Trick to bypass the stdenv usual change of propagatedBuildInputs => propagatedNativeBuildInputs
propagatedBuildInputs2 = propagatedBuildInputs; propagatedBuildInputs2 = propagatedBuildInputs;
@ -89,7 +89,7 @@ mkDerivation {
"$setupNew" > "$s" "$setupNew" > "$s"
cat >> "$out/dev-envs/''${name/env-/}" << EOF cat >> "$out/dev-envs/''${name/env-/}" << EOF
nativeBuildInputs="$nativeBuildInputs" nativeBuildInputs="$nativeBuildInputs"
propagatedBuildInputs="$propagatedBuildInputs2" propagatedNativeBuildInputs="$propagatedBuildInputs2"
# 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"