about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-03-17T16·35+0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-03-17T16·35+0100
commitf93e97517e449cb1b3c7bdf8076812276b4cb2cd (patch)
treeb71f35e7552ade31dd2f64fea98231d58cb25048
parent77e2cc6c8ed1206c029218d3bc22575202a73b4c (diff)
Fix -j and other flags when using the daemon
-rw-r--r--src/nix-daemon/nix-daemon.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index f40cdd51b4b6..882078c08eb3 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -537,10 +537,10 @@ static void performOp(bool trusted, unsigned int clientVersion,
     case wopSetOptions: {
         settings.keepFailed = readInt(from) != 0;
         settings.keepGoing = readInt(from) != 0;
-        settings.tryFallback = readInt(from) != 0;
+        settings.set("build-fallback", readInt(from) ? "true" : "false");
         verbosity = (Verbosity) readInt(from);
-        settings.maxBuildJobs = readInt(from);
-        settings.maxSilentTime = readInt(from);
+        settings.set("build-max-jobs", int2String(readInt(from)));
+        settings.set("build-max-silent-time", int2String(readInt(from)));
         if (GET_PROTOCOL_MINOR(clientVersion) >= 2)
             settings.useBuildHook = readInt(from) != 0;
         if (GET_PROTOCOL_MINOR(clientVersion) >= 4) {
@@ -549,9 +549,9 @@ static void performOp(bool trusted, unsigned int clientVersion,
             settings.printBuildTrace = readInt(from) != 0;
         }
         if (GET_PROTOCOL_MINOR(clientVersion) >= 6)
-            settings.buildCores = readInt(from);
+            settings.set("build-cores", int2String(readInt(from)));
         if (GET_PROTOCOL_MINOR(clientVersion) >= 10)
-            settings.useSubstitutes = readInt(from) != 0;
+            settings.set("build-use-substitutes", readInt(from) ? "true" : "false");
         if (GET_PROTOCOL_MINOR(clientVersion) >= 12) {
             unsigned int n = readInt(from);
             for (unsigned int i = 0; i < n; i++) {
@@ -562,8 +562,8 @@ static void performOp(bool trusted, unsigned int clientVersion,
                 else
                     settings.set(trusted ? name : "untrusted-" + name, value);
             }
-            settings.update();
         }
+        settings.update();
         startWork();
         stopWork();
         break;