mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #1314

Browse source 
Also, make nix-shell respect --option. (Previously it only passed it
along to nix-instantiate and nix-build.)
This commit is contained in:
Eelco Dolstra 2017-05-24 11:33:42 +02:00
parent fbe9fe0e75
commit a7e55151a8
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -196,6 +196,7 @@ int main(int argc, char ** argv)
buildArgs.push_back(arg); buildArgs.push_back(arg);
buildArgs.push_back(args[n + 1]); buildArgs.push_back(args[n + 1]);
buildArgs.push_back(args[n + 2]); buildArgs.push_back(args[n + 2]);
settings.set(args[n + 1], args[n + 2]);
n += 2; n += 2;
} }
@ -407,7 +408,7 @@ 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;
env["NIX_BUILD_CORES"] = settings.buildCores; env["NIX_BUILD_CORES"] = std::to_string(settings.buildCores);
auto passAsFile = tokenizeString<StringSet>(get(drv.env, "passAsFile", "")); auto passAsFile = tokenizeString<StringSet>(get(drv.env, "passAsFile", ""));