about summary refs log tree commit diff
path: root/src/libstore/globals.cc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-09-06T14·36+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-09-06T14·36+0200
commit936f9d45baf474358346666ed9ad7f56960bb455 (patch)
treed6c91635fee9b27da7875b1b6e9052c04b20b072 /src/libstore/globals.cc
parent4b83830d0c742b69b59c698a42948eaa6d214c1d (diff)
Don't apply the CPU affinity hack to nix-shell (and other Perl programs)
As discovered by Todd Veldhuizen, the shell started by nix-shell has
its affinity set to a single CPU.  This is because nix-shell connects
to the Nix daemon, which causes the affinity hack to be applied.  So
we turn this off for Perl programs.
Diffstat (limited to 'src/libstore/globals.cc')
-rw-r--r--src/libstore/globals.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index aeb52e1a8696..7e0157cd365a 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -54,6 +54,7 @@ Settings::Settings()
     gcKeepDerivations = true;
     autoOptimiseStore = false;
     envKeepDerivations = false;
+    lockCPU = getEnv("NIX_AFFINITY_HACK", "1") == "1";
 }