diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-10-08 11:23:22 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-10-08 11:37:07 +0200 |
| commit | cf3d1763ede1a329c2bc932c84591ab594bb6c96 (patch) | |
| tree | 665f92418f8671474de3815241fb657384463c94 /guix/scripts | |
| parent | d57660c54907cc6fba8b0adf6295fd2311ada6cf (diff) | |
| parent | 2fa55c72476c73211cbb2d6b29c05a1ad58a6cf9 (diff) | |
Merge branch 'core-updates'
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/environment.scm | 10 | ||||
| -rw-r--r-- | guix/scripts/pack.scm | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 4a51654ce6..d78ca0f303 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -29,7 +29,7 @@ #:use-module (guix search-paths) #:use-module (guix build utils) #:use-module (guix monads) - #:use-module ((guix gexp) #:select (lower-inputs)) + #:use-module ((guix gexp) #:select (lower-object)) #:use-module (guix scripts) #:use-module (guix scripts build) #:use-module (gnu build linux-container) @@ -40,7 +40,8 @@ #:use-module (gnu packages bash) #:use-module (gnu packages commencement) #:use-module (gnu packages guile) - #:use-module ((gnu packages bootstrap) #:select (%bootstrap-guile)) + #:use-module ((gnu packages bootstrap) + #:select (bootstrap-executable %bootstrap-guile)) #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 rdelim) @@ -630,8 +631,7 @@ Otherwise, return the derivation for the Bash package." (package->derivation bash)) ;; Use the bootstrap Bash instead. ((and container? bootstrap?) - (interned-file - (search-bootstrap-binary "bash" system))) + (lower-object (bootstrap-executable "bash" system))) (else (return #f))))) @@ -764,7 +764,7 @@ message if any test fails." (container? (let ((bash-binary (if bootstrap? - bash + (derivation->output-path bash) (string-append (derivation->output-path bash) "/bin/sh")))) (launch-environment/container #:command command diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 2543f0c0b5..920d6c01fe 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -574,9 +574,9 @@ the image." "Return the C compiler that uses the bootstrap toolchain. This is used only by '--bootstrap', for testing purposes." (define bootstrap-toolchain - (list (first (assoc-ref %bootstrap-inputs "gcc")) - (first (assoc-ref %bootstrap-inputs "binutils")) - (first (assoc-ref %bootstrap-inputs "libc")))) + (list (first (assoc-ref (%bootstrap-inputs) "gcc")) + (first (assoc-ref (%bootstrap-inputs) "binutils")) + (first (assoc-ref (%bootstrap-inputs) "libc")))) (c-compiler bootstrap-toolchain #:guile %bootstrap-guile)) |