From 936f9d45baf474358346666ed9ad7f56960bb455 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Sep 2013 16:36:56 +0200
Subject: 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.
---
 src/libstore/globals.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/libstore/globals.cc')

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";
 }
 
 
-- 
cgit 1.4.1