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

Revert "Don't fail if env-vars cannot be written to"

Browse Source
This commit is contained in:
Vladimír Čunát 2015-11-04 07:30:02 +01:00
parent baba136c30
commit b4bd19762a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/builder-defs/builder-defs.nix
View File

@ -336,7 +336,7 @@ let inherit (builtins) head tail trace; in
doDump = n: noDepEntry "echo Dump number ${n}; set"; doDump = n: noDepEntry "echo Dump number ${n}; set";
saveEnv = noDepEntry ''export > "$TMP/env-vars" || true''; saveEnv = noDepEntry ''export > $TMP/env-vars'';
doDumpBuildInputs = noDepEntry ('' doDumpBuildInputs = noDepEntry (''
echo "${toString realBuildInputs}" echo "${toString realBuildInputs}"

2
pkgs/stdenv/generic/setup.sh
View File

@ -450,7 +450,7 @@ substituteAllInPlace() {
# the environment used for building. # the environment used for building.
dumpVars() { dumpVars() {
if [ "$noDumpEnvVars" != 1 ]; then if [ "$noDumpEnvVars" != 1 ]; then
export > "$NIX_BUILD_TOP/env-vars" || true export > "$NIX_BUILD_TOP/env-vars"
fi fi
} }