~ruther/guix-local: environment: Set build options early on.

471cdfdb193357de7d76600ce6a5dcdbdbba1320 — Ludovic Courtès 10 years ago f79a576

environment: Set build options early on.

This fixes a bug whereby some options, such as #:substitute-urls, would
be passed to the daemon too late to have an effect.

* guix/scripts/environment.scm (build-inputs): Remove call to
'set-build-options-from-command-line*'.
(guix-environment): Add call to 'set-build-options-from-command-line' as
early as possible.

patch browse .tar.gz

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

M guix/scripts/environment.scm

M guix/scripts/environment.scm => guix/scripts/environment.scm +1 -1

@@ 294,7 294,6 @@ OUTPUT) tuples, using the build options in OPTS."
          (if dry-run?
              (return #f)
              (mbegin %store-monad
-               (set-build-options-from-command-line* opts)
                (built-derivations derivations)
                (return derivations))))))))
 


@@ 500,6 499,7 @@ message if any test fails."
       (when container? (assert-container-features))
 
       (with-store store
+        (set-build-options-from-command-line store opts)
         (run-with-store store
           (mlet* %store-monad ((inputs (lower-inputs
                                         (map (match-lambda