public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

myEnv: stdenv doesn't mangle dependencies like that anymore

Browse Source
This commit is contained in:
John Ericson 2017-09-05 11:34:53 -04:00
parent 252b36a28d
commit 9626ffbf14
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,11 +62,7 @@
, cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}: , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}:
mkDerivation { mkDerivation {
# The setup.sh script from stdenv will expect the native build inputs in inherit buildInputs propagatedBuildInputs;
# the nativeBuildInputs environment variable.
nativeBuildInputs = [ ] ++ buildInputs;
# Trick to bypass the stdenv usual change of propagatedBuildInputs => propagatedNativeBuildInputs
propagatedBuildInputs2 = propagatedBuildInputs;
name = "env-${name}"; name = "env-${name}";
phases = [ "buildPhase" "fixupPhase" ]; phases = [ "buildPhase" "fixupPhase" ];
@ -89,8 +85,8 @@ mkDerivation {
"$setupNew" > "$s" "$setupNew" > "$s"
cat >> "$out/dev-envs/''${name/env-/}" << EOF cat >> "$out/dev-envs/''${name/env-/}" << EOF
defaultNativeBuildInputs="$defaultNativeBuildInputs" defaultNativeBuildInputs="$defaultNativeBuildInputs"
nativeBuildInputs="$nativeBuildInputs" buildInputs="$buildInputs"
propagatedBuildInputs="$propagatedBuildInputs2" 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 # 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"