diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-11-28 21:53:51 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-11-28 21:53:51 +0100 |
| commit | 471cdfdb193357de7d76600ce6a5dcdbdbba1320 (patch) | |
| tree | deebec0236556048b66de379eee16648cd796cbb | |
| parent | f79a576e776eb299af52d60cdd51f4a4f79beee3 (diff) | |
| download | patches-471cdfdb193357de7d76600ce6a5dcdbdbba1320.tar patches-471cdfdb193357de7d76600ce6a5dcdbdbba1320.tar.gz | |
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.
| -rw-r--r-- | guix/scripts/environment.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index fae261733e..2cc5f366a7 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -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 |