From 3711cd8f1d901b424b2073dc54be4eec83c95482 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Mon, 20 Nov 2023 11:49:10 +0000
Subject: Use a temporary store connection for substituting derivations

---
 guix-build-coordinator/agent.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'guix-build-coordinator')

diff --git a/guix-build-coordinator/agent.scm b/guix-build-coordinator/agent.scm
index 599a70a..52e4b15 100644
--- a/guix-build-coordinator/agent.scm
+++ b/guix-build-coordinator/agent.scm
@@ -877,10 +877,13 @@ but the guix-daemon claims it's unavailable"
                            build-id ": substituting derivation")
                   (retry-on-error
                    (lambda ()
-                     (substitute-derivation store
-                                            derivation-name
-                                            #:substitute-urls
-                                            derivation-substitute-urls)
+                     (with-store/non-blocking fetch-substitute-store
+                       ;; substitute-derivation uses set-build-options, so use
+                       ;; a temporary store connection
+                       (substitute-derivation store
+                                              derivation-name
+                                              #:substitute-urls
+                                              derivation-substitute-urls))
                      (add-temp-root store derivation-name))
                    #:times 20
                    #:delay (random 15))
-- 
cgit v1.2.3