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
parent
f79a576e77
commit
471cdfdb19
|
@ -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
|
||||
|
|
Reference in New Issue