alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #10262 from wmertens/nofailnixshell

Browse source 
Don't fail if env-vars cannot be written to
This commit is contained in:
Wout Mertens 2015-11-04 07:21:56 +01:00
parent 3ea8b08004 b21a5013a0
commit baba136c30
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";
saveEnv = noDepEntry ''export > $TMP/env-vars'';
saveEnv = noDepEntry ''export > "$TMP/env-vars" || true'';
doDumpBuildInputs = noDepEntry (''
echo "${toString realBuildInputs}"

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

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