From 661672a7f82db706be8dcc962d5e2385bdcf8c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 28 Oct 2023 01:21:56 +0200
Subject: [PATCH] =?UTF-8?q?environment:=20Parameterize=20=E2=80=98%graft?=
 =?UTF-8?q?=3F=E2=80=99=20early=20on.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously, ‘%graft?’ would be parameterized after ‘package-derivation’
had been called for ‘%guile-for-build’, which is too late.

* guix/scripts/environment.scm (guix-environment*)[with-store/maybe]:
Parameterize ‘%graft?’.
Remove ‘%graft?’ parameterization from body.

Change-Id: I65ef4a8c5f27e19a49196005871e5f7057fabaec
---
 guix/scripts/environment.scm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 61ef639b46..ad5d6a1026 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -1100,17 +1100,18 @@ command-line option processing with 'parse-command-line'."
       ;; Evaluate EXP... with STORE bound to a connection, unless
       ;; STORE-NEEDED? is false, in which case STORE is bound to #f.
       (let ((proc (lambda (store) exp ...)))
-        (if store-needed?
-            (with-store s
-              (set-build-options-from-command-line s opts)
-              (with-build-handler (build-notifier #:use-substitutes?
-                                                  (assoc-ref opts 'substitutes?)
-                                                  #:verbosity
-                                                  (assoc-ref opts 'verbosity)
-                                                  #:dry-run?
-                                                  (assoc-ref opts 'dry-run?))
-                (proc s)))
-            (proc #f))))
+        (parameterize ((%graft? (assoc-ref opts 'graft?)))
+          (if store-needed?
+              (with-store s
+                (set-build-options-from-command-line s opts)
+                (with-build-handler (build-notifier #:use-substitutes?
+                                                    (assoc-ref opts 'substitutes?)
+                                                    #:verbosity
+                                                    (assoc-ref opts 'verbosity)
+                                                    #:dry-run?
+                                                    (assoc-ref opts 'dry-run?))
+                  (proc s)))
+              (proc #f)))))
 
     (when container? (assert-container-features))
 
@@ -1146,8 +1147,7 @@ command-line option processing with 'parse-command-line'."
           (warning (G_ "no packages specified; creating an empty environment~%")))
 
         ;; Use the bootstrap Guile when requested.
-        (parameterize ((%graft? (assoc-ref opts 'graft?))
-                       (%guile-for-build
+        (parameterize ((%guile-for-build
                         (and store-needed?
                              (package-derivation
                               store