about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-05-24T09·28+0200
committerEelco Dolstra <edolstra@gmail.com>2017-05-24T09·28+0200
commitfbe9fe0e7504d2f00eda3971ecd4997e43e3784d (patch)
tree908334aba1b6fda57bc6c91f1a94007c3c4582e2 /src
parent9e43a4a041137001d51f451ec6c5e2c1047c7370 (diff)
parentf12a048a0595ea75453c6b67a3b72da8106fc6ad (diff)
Merge branch 'topic/cores-master' of https://github.com/neilmayhew/nix
Diffstat (limited to 'src')
-rwxr-xr-xsrc/nix-build/nix-build.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index d5f23a37fe65..7167e96f11d3 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", ""));