1 files changed, 10 insertions, 1 deletions
diff --git a/guix/remote.scm b/guix/remote.scm
index f6adb22846..37e9827084 100644
--- a/guix/remote.scm
+++ b/guix/remote.scm
@@ -146,6 +146,15 @@ remote store."
                                sources)))
           (mbegin %store-monad
             ((store-lift send-files) to-send remote #:recursive? #t)
-            (return (build-derivations remote inputs))
+
+            ;; Build handlers are not tied to a specific <store-connection>.
+            ;; If a handler is already installed, it might want to go ahead
+            ;; and build, but on the local <store-connection> instead of
+            ;; REMOTE.  To avoid that, install a build handler that does
+            ;; nothing.
+            (return (with-build-handler (lambda (continue . _)
+                                          (continue #t))
+                      (build-derivations remote inputs)))
+
             (return (close-connection remote))
             (return (%remote-eval lowered session become-command)))))))