daemon: Add 'buildMode' parameter to 'buildPaths' RPC

1 files changed, 9 insertions, 3 deletions

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index ed9895ac8..262e4650b 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -438,12 +438,18 @@ Paths RemoteStore::importPaths(bool requireSignature, Source & source)
 
 void RemoteStore::buildPaths(const PathSet & drvPaths, BuildMode buildMode)
 {
-    if (buildMode != bmNormal) throw Error("repairing or checking is not supported when building through the Nix daemon");
     openConnection();
     to << wopBuildPaths;
-    if (GET_PROTOCOL_MINOR(daemonVersion) >= 13)
+    if (GET_PROTOCOL_MINOR(daemonVersion) >= 13) {
         to << drvPaths;
-    else {
+        if (GET_PROTOCOL_MINOR(daemonVersion) >= 15)
+            to << buildMode;
+        else
+            /* Old daemons did not take a 'buildMode' parameter, so we
+               need to validate it here on the client side.  */
+            if (buildMode != bmNormal)
+                throw Error("repairing or checking is not supported when building through the Nix daemon");
+    } else {
         /* For backwards compatibility with old daemons, strip output
            identifiers. */
         PathSet drvPaths2;