summaryrefslogtreecommitdiff
path: root/guix/scripts
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-07-12 12:04:55 +0200
committerLudovic Courtès <ludo@gnu.org>2017-07-12 21:56:17 +0200
commit1ac3a488ad9724ecc45450c57eab2d360f274303 (patch)
treec3d1ac03ed33a8d806a1812cb75865ff8e7f679f /guix/scripts
parent5149ff1b5f0c6c1e66a0702f14a1010fc6feb105 (diff)
downloadgnu-guix-1ac3a488ad9724ecc45450c57eab2d360f274303.tar
gnu-guix-1ac3a488ad9724ecc45450c57eab2d360f274303.tar.gz
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'.
Diffstat (limited to 'guix/scripts')
-rw-r--r--guix/scripts/environment.scm7
1 files changed, 3 insertions, 4 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 0abc509a35..95ba199d97 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -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?