Merge branch 'topic/cores-master' of https://github.com/neilmayhew/nix
This commit is contained in:
commit
fbe9fe0e75
1 changed files with 1 additions and 0 deletions
|
@ -407,6 +407,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;
|
||||||
|
|
||||||
auto passAsFile = tokenizeString<StringSet>(get(drv.env, "passAsFile", ""));
|
auto passAsFile = tokenizeString<StringSet>(get(drv.env, "passAsFile", ""));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue