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'.
This commit is contained in:
parent
5149ff1b5f
commit
1ac3a488ad
|
@ -313,9 +313,7 @@ (define* (build-environment derivations opts)
|
||||||
#:dry-run? dry-run?)
|
#:dry-run? dry-run?)
|
||||||
(if dry-run?
|
(if dry-run?
|
||||||
(return #f)
|
(return #f)
|
||||||
(mbegin %store-monad
|
(built-derivations derivations)))))
|
||||||
(set-build-options-from-command-line* opts)
|
|
||||||
(built-derivations derivations))))))
|
|
||||||
|
|
||||||
(define (inputs->profile-derivation inputs system bootstrap?)
|
(define (inputs->profile-derivation inputs system bootstrap?)
|
||||||
"Return the derivation for a profile consisting of INPUTS for SYSTEM.
|
"Return the derivation for a profile consisting of INPUTS for SYSTEM.
|
||||||
|
@ -580,6 +578,8 @@ (define (guix-environment . args)
|
||||||
(when container? (assert-container-features))
|
(when container? (assert-container-features))
|
||||||
|
|
||||||
(with-store store
|
(with-store store
|
||||||
|
(set-build-options-from-command-line store opts)
|
||||||
|
|
||||||
;; Use the bootstrap Guile when requested.
|
;; Use the bootstrap Guile when requested.
|
||||||
(parameterize ((%graft? (assoc-ref opts 'graft?))
|
(parameterize ((%graft? (assoc-ref opts 'graft?))
|
||||||
(%guile-for-build
|
(%guile-for-build
|
||||||
|
@ -588,7 +588,6 @@ (define (guix-environment . args)
|
||||||
(if bootstrap?
|
(if bootstrap?
|
||||||
%bootstrap-guile
|
%bootstrap-guile
|
||||||
(canonical-package guile-2.0)))))
|
(canonical-package guile-2.0)))))
|
||||||
(set-build-options-from-command-line store opts)
|
|
||||||
(run-with-store store
|
(run-with-store store
|
||||||
;; Containers need a Bourne shell at /bin/sh.
|
;; Containers need a Bourne shell at /bin/sh.
|
||||||
(mlet* %store-monad ((bash (environment-bash container?
|
(mlet* %store-monad ((bash (environment-bash container?
|
||||||
|
|
Loading…
Reference in a new issue