me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ludovic Courtès 2015-11-28 21:53:51 +01:00
parent f79a576e77
commit 471cdfdb19
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guix/scripts/environment.scm
View File

@ -294,7 +294,6 @@ OUTPUT) tuples, using the build options in OPTS."
(if dry-run? (if dry-run?
(return #f) (return #f)
(mbegin %store-monad (mbegin %store-monad
(set-build-options-from-command-line* opts)
(built-derivations derivations) (built-derivations derivations)
(return derivations)))))))) (return derivations))))))))
@ -500,6 +499,7 @@ message if any test fails."
(when container? (assert-container-features)) (when container? (assert-container-features))
(with-store store (with-store store
(set-build-options-from-command-line store opts)
(run-with-store store (run-with-store store
(mlet* %store-monad ((inputs (lower-inputs (mlet* %store-monad ((inputs (lower-inputs
(map (match-lambda (map (match-lambda