diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-05-24 11:28:36 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-05-24 11:28:36 +0200 |
| commit | fbe9fe0e7504d2f00eda3971ecd4997e43e3784d (patch) | |
| tree | 908334aba1b6fda57bc6c91f1a94007c3c4582e2 /src | |
| parent | 9e43a4a041137001d51f451ec6c5e2c1047c7370 (diff) | |
| parent | f12a048a0595ea75453c6b67a3b72da8106fc6ad (diff) | |
Merge branch 'topic/cores-master' of https://github.com/neilmayhew/nix
Diffstat (limited to 'src')
| -rwxr-xr-x | src/nix-build/nix-build.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc index d5f23a37f..7167e96f1 100755 --- a/src/nix-build/nix-build.cc +++ b/src/nix-build/nix-build.cc @@ -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", "")); |