maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix-shell: Implement passAsFile

Browse source
This commit is contained in:
Eelco Dolstra 2017-05-03 15:01:15 +02:00
parent 782c0bff45
commit 08355643ab
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,7 @@
#include "shared.hh" #include "shared.hh"
using namespace nix; using namespace nix;
using namespace std::string_literals;
extern char * * environ; extern char * * environ;
@ -407,7 +408,19 @@ int main(int argc, char ** argv)
env["NIX_BUILD_TOP"] = env["TMPDIR"] = env["TEMPDIR"] = env["TMP"] = env["TEMP"] = tmp; env["NIX_BUILD_TOP"] = env["TMPDIR"] = env["TEMPDIR"] = env["TMP"] = env["TEMP"] = tmp;
env["NIX_STORE"] = store->storeDir; env["NIX_STORE"] = store->storeDir;
auto passAsFile = tokenizeString<StringSet>(get(drv.env, "passAsFile", ""));
bool keepTmp = false;
int fileNr = 0;
for (auto & var : drv.env) for (auto & var : drv.env)
if (passAsFile.count(var.first)) {
keepTmp = true;
string fn = ".attr-" + std::to_string(fileNr++);
Path p = (Path) tmpDir + "/" + fn;
writeFile(p, var.second);
env[var.first + "Path"] = p;
} else
env[var.first] = var.second; env[var.first] = var.second;
restoreAffinity(); restoreAffinity();
@ -418,7 +431,7 @@ int main(int argc, char ** argv)
// the current $PATH directories. // the current $PATH directories.
auto rcfile = (Path) tmpDir + "/rc"; auto rcfile = (Path) tmpDir + "/rc";
writeFile(rcfile, fmt( writeFile(rcfile, fmt(
"rm -rf '%1%'; " (keepTmp ? "" : "rm -rf '%1%'; "s) +
"[ -n \"$PS1\" ] && [ -e ~/.bashrc ] && source ~/.bashrc; " "[ -n \"$PS1\" ] && [ -e ~/.bashrc ] && source ~/.bashrc; "
"%2%" "%2%"
"dontAddDisableDepTrack=1; " "dontAddDisableDepTrack=1; "