diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-05 16:30:40 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-05 16:32:22 -0500 |
| commit | 5b6da99ea09a166ad8d79fc2fb2c371958a9bd93 (patch) | |
| tree | 74b613ea62b249ee7689457df01b91eef3aaf6c1 /pkgs/stdenv | |
| parent | 9ffedfef814f58ffef7499d23fcdc1025f6fc0df (diff) | |
| download | nixpkgs-5b6da99ea09a166ad8d79fc2fb2c371958a9bd93.tar nixpkgs-5b6da99ea09a166ad8d79fc2fb2c371958a9bd93.tar.gz nixpkgs-5b6da99ea09a166ad8d79fc2fb2c371958a9bd93.tar.bz2 nixpkgs-5b6da99ea09a166ad8d79fc2fb2c371958a9bd93.tar.lz nixpkgs-5b6da99ea09a166ad8d79fc2fb2c371958a9bd93.tar.xz nixpkgs-5b6da99ea09a166ad8d79fc2fb2c371958a9bd93.tar.zst nixpkgs-5b6da99ea09a166ad8d79fc2fb2c371958a9bd93.zip | |
stdenv: Don't unset propagated*DepFiles before main phases
A bunch of stdenv-internal variables were deleted in 1601a7fcce389ae3f1b1b36676fd5545035566af, but these are needed in the fixup phase, whereas the rest are just needed for the initial work (findInputs, etc) before the user phases. CC @matthewbauer
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index a95bdc12095..730e77c20f9 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -575,7 +575,7 @@ _addToEnv unset allPlatOffsets unset pkgBuildAccumVars pkgHostAccumVars pkgTargetAccumVars pkgAccumVarVars unset pkgBuildHookVars pkgHostHookVars pkgTargetHookVars pkgHookVarVars -unset propagatedBuildDepFiles propagatedHostDepFiles propagatedTargetDepFiles propagatedDepFilesVars +unset propagatedDepFilesVars _addRpathPrefix "$out" |