Merge branch 'topic/cores-master' of https://github.com/neilmayhew/nix

This commit is contained in:
Eelco Dolstra 2017-05-24 11:28:36 +02:00
commit fbe9fe0e75
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE

View file

@ -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_STORE"] = store->storeDir;
env["NIX_BUILD_CORES"] = settings.buildCores;
auto passAsFile = tokenizeString<StringSet>(get(drv.env, "passAsFile", ""));