diff options
author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-08-01 21:28:49 -0400 |
---|---|---|
committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-08-02 08:21:30 -0400 |
commit | 438e02529dfb4b26603e2a06992df977cd80ecd9 (patch) | |
tree | c7545b9b40190ce2c60e12e536243db70d7b1edb /src | |
parent | b27431b7cb918e6866f4bb4fa7ec6e23240cfeab (diff) |
Allows selectively adding environment variables to pure shells.
Includes documentation and test.
Diffstat (limited to 'src')
-rwxr-xr-x | src/nix-build/nix-build.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc index de0e9118f..a7ec206aa 100755 --- a/src/nix-build/nix-build.cc +++ b/src/nix-build/nix-build.cc @@ -99,6 +99,9 @@ void mainWrapped(int argc, char * * argv) std::string outLink = "./result"; + // List of environment variables kept for --pure + std::set<string> keepVars{"HOME", "USER", "LOGNAME", "DISPLAY", "PATH", "TERM", "IN_NIX_SHELL", "TZ", "PAGER", "NIX_BUILD_SHELL", "SHLVL"}; + Strings args; for (int i = 1; i < argc; ++i) args.push_back(argv[i]); @@ -218,6 +221,9 @@ void mainWrapped(int argc, char * * argv) } } + else if (*arg == "--keep") + keepVars.insert(getArg(*arg, arg, end)); + else if (*arg == "-") readStdin = true; @@ -368,7 +374,6 @@ void mainWrapped(int argc, char * * argv) auto tmp = getEnv("TMPDIR", getEnv("XDG_RUNTIME_DIR", "/tmp")); if (pure) { - std::set<string> keepVars{"HOME", "USER", "LOGNAME", "DISPLAY", "PATH", "TERM", "IN_NIX_SHELL", "TZ", "PAGER", "NIX_BUILD_SHELL", "SHLVL"}; decltype(env) newEnv; for (auto & i : env) if (keepVars.count(i.first)) |