lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #1275 from steveeJ/patch-1

Browse source 
nix-shell/pure: keep environment variable SHLVL
This commit is contained in:
Eelco Dolstra 2017-03-20 17:38:40 +01:00 committed by GitHub
parent 558eda0115 f628ca2a1f
commit dc931fe1cd
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nix-build/nix-build.cc
View file

@ -394,7 +394,7 @@ int main(int argc, char ** argv)
auto tmp = getEnv("TMPDIR", getEnv("XDG_RUNTIME_DIR", "/tmp")); auto tmp = getEnv("TMPDIR", getEnv("XDG_RUNTIME_DIR", "/tmp"));
if (pure) { if (pure) {
std::set<string> keepVars{"HOME", "USER", "LOGNAME", "DISPLAY", "PATH", "TERM", "IN_NIX_SHELL", "TZ", "PAGER", "NIX_BUILD_SHELL"}; std::set<string> keepVars{"HOME", "USER", "LOGNAME", "DISPLAY", "PATH", "TERM", "IN_NIX_SHELL", "TZ", "PAGER", "NIX_BUILD_SHELL", "SHLVL"};
decltype(env) newEnv; decltype(env) newEnv;
for (auto & i : env) for (auto & i : env)
if (keepVars.count(i.first)) if (keepVars.count(i.first))