3 files changed, 5 insertions, 1 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";
 }
 
 
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index 50b61725c742..cbc6d4e9848e 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -183,6 +183,9 @@ struct Settings {
        (to prevent them from being GCed). */
     bool envKeepDerivations;
 
+    /* Whether to lock the Nix client and worker to the same CPU. */
+    bool lockCPU;
+
 private:
     SettingsMap settings, overrides;
 
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 3764b4813a4e..3017254baf3b 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -73,7 +73,7 @@ void RemoteStore::openConnection(bool reserveSpace)
         writeInt(PROTOCOL_VERSION, to);
 
         if (GET_PROTOCOL_MINOR(daemonVersion) >= 14) {
-            int cpu = lockToCurrentCPU();
+            int cpu = settings.lockCPU ? lockToCurrentCPU() : -1;
             if (cpu != -1) {
                 writeInt(1, to);
                 writeInt(cpu, to);