about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-04-14T11·42+0200
committerEelco Dolstra <edolstra@gmail.com>2017-04-14T11·42+0200
commit3872371f25acb9250d34554192196caee855fcb4 (patch)
tree207e39a7aa44aa7b0c0a79f4b60d5b40eccf3b3b
parent01dcdfcf336a127438b35b81751a783cde063ab8 (diff)
Minor cleanup
-rw-r--r--src/libmain/shared.cc2
-rw-r--r--src/nix-daemon/nix-daemon.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index 9d506d019233..4747b9bf9b4c 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -159,7 +159,7 @@ struct LegacyArgs : public MixCommonArgs
             &(bool&) settings.keepGoing);
 
         mkFlag(0, "fallback", "build from source if substitution fails", []() {
-            settings.set("build-fallback", "true");
+            settings.tryFallback = true;
         });
 
         mkFlag1('j', "max-jobs", "jobs", "maximum number of parallel builds", [=](std::string s) {
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index 90bfc67d8775..1389353bb5d8 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -440,13 +440,13 @@ static void performOp(ref<LocalStore> store, bool trusted, unsigned int clientVe
         settings.keepGoing = readInt(from);
         settings.tryFallback = readInt(from);
         verbosity = (Verbosity) readInt(from);
-        settings.set("build-max-jobs", std::to_string(readInt(from)));
+        settings.maxBuildJobs = readInt(from);
         settings.maxSilentTime = readInt(from);
         settings.useBuildHook = readInt(from) != 0;
         settings.verboseBuild = lvlError == (Verbosity) readInt(from);
         readInt(from); // obsolete logType
         readInt(from); // obsolete printBuildTrace
-        settings.set("build-cores", std::to_string(readInt(from)));
+        settings.buildCores = readInt(from);
         settings.useSubstitutes  = readInt(from);
         if (GET_PROTOCOL_MINOR(clientVersion) >= 12) {
             unsigned int n = readInt(from);