nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Ludovic Courtès 2017-07-12 12:04:55 +02:00
parent 5149ff1b5f
commit 1ac3a488ad
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/scripts/environment.scm
View File

@ -313,9 +313,7 @@ in OPTS."
#:dry-run? dry-run?)
(if dry-run?
(return #f)
(mbegin %store-monad
(set-build-options-from-command-line* opts)
(built-derivations derivations))))))
(built-derivations derivations)))))
(define (inputs->profile-derivation inputs system bootstrap?)
"Return the derivation for a profile consisting of INPUTS for SYSTEM.
@ -580,6 +578,8 @@ message if any test fails."
(when container? (assert-container-features))
(with-store store
(set-build-options-from-command-line store opts)
;; Use the bootstrap Guile when requested.
(parameterize ((%graft? (assoc-ref opts 'graft?))
(%guile-for-build
@ -588,7 +588,6 @@ message if any test fails."
(if bootstrap?
%bootstrap-guile
(canonical-package guile-2.0)))))
(set-build-options-from-command-line store opts)
(run-with-store store
;; Containers need a Bourne shell at /bin/sh.
(mlet* %store-monad ((bash (environment-bash container?