~ruther/guix-local: environment: Rationalize calls to 'set-build-options'.

1ac3a488ad9724ecc45450c57eab2d360f274303 — Ludovic Courtès 8 years ago 5149ff1

environment: Rationalize calls to 'set-build-options'.

Before this change '--substitute-urls' would be ignored.

* guix/scripts/environment.scm (build-environment): Remove redundant
call to 'set-build-options-from-command-line*'.
(guix-environment): Move 'set-build-options-from-command-line' right
after 'with-store'.

patch browse .tar.gz

1 files changed, 3 insertions(+), 4 deletions(-)

M guix/scripts/environment.scm

M guix/scripts/environment.scm => guix/scripts/environment.scm +3 -4

@@ 313,9 313,7 @@ in OPTS."
                            #:dry-run? dry-run?)
       (if dry-run?
           (return #f)
-          (mbegin %store-monad
-            (set-build-options-from-command-line* opts)
-            (built-derivations derivations))))))
+          (built-derivations derivations)))))
 
 (define (inputs->profile-derivation inputs system bootstrap?)
   "Return the derivation for a profile consisting of INPUTS for SYSTEM.


@@ 580,6 578,8 @@ message if any test fails."
       (when container? (assert-container-features))
 
       (with-store store
+        (set-build-options-from-command-line store opts)
+
         ;; Use the bootstrap Guile when requested.
         (parameterize ((%graft? (assoc-ref opts 'graft?))
                        (%guile-for-build


@@ 588,7 588,6 @@ message if any test fails."
                          (if bootstrap?
                              %bootstrap-guile
                              (canonical-package guile-2.0)))))
-          (set-build-options-from-command-line store opts)
           (run-with-store store
             ;; Containers need a Bourne shell at /bin/sh.
             (mlet* %store-monad ((bash       (environment-bash container?