diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-07-17 15:51:10 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-07-17 15:51:10 +0200 |
| commit | 64de896a71a9ba3091259834077d54c0146bdab6 (patch) | |
| tree | da58cc584fcc42a2b04f692aa3b1ada4c8949f5e /gnu/packages/bootstrap.scm | |
| parent | 5247aab8d6a18a4081ab7caeddb4fc083bca1f6b (diff) | |
| parent | 6bfcb729268e0d20c6ae78224aef0eaad2ee2e74 (diff) | |
| download | guix-64de896a71a9ba3091259834077d54c0146bdab6.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/bootstrap.scm')
| -rw-r--r-- | gnu/packages/bootstrap.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 428a89e927..8dbe52435e 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -30,7 +30,7 @@ #:use-module ((guix store) #:select (run-with-store add-to-store add-text-to-store)) #:use-module ((guix derivations) - #:select (derivation derivation->output-path)) + #:select (derivation derivation-input derivation->output-path)) #:use-module ((guix utils) #:select (gnu-triplet->nix-system)) #:use-module (guix memoization) #:use-module (guix i18n) @@ -400,8 +400,9 @@ $out/bin/guile --version~%" (derivation store name (derivation->output-path bash) `(,builder) #:system system - #:inputs `((,bash) (,mkdir) (,tar) (,xz) - (,builder) (,guile)) + #:inputs (map derivation-input + (list bash mkdir tar xz guile)) + #:sources (list builder) #:env-vars `(("GUILE_TARBALL" . ,(derivation->output-path guile)))))) |