From 5b6da99ea09a166ad8d79fc2fb2c371958a9bd93 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 5 Nov 2019 16:30:40 -0500 Subject: 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 --- pkgs/stdenv/generic/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index a95bdc12095f..730e77c20f90 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" -- cgit v1.2.3