diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-07-09 23:21:20 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-07-15 10:01:05 +0200 |
| commit | 266e54e2acebf7a5ba51422269a0af677c9934a4 (patch) | |
| tree | 7ab4d812288d166be2350734513e76cb2d027a6b | |
| parent | 386857748097619b3b75a7bf93677b6aa742d03c (diff) | |
| download | guix-266e54e2acebf7a5ba51422269a0af677c9934a4.tar guix-266e54e2acebf7a5ba51422269a0af677c9934a4.tar.gz | |
gnu: guile-bootstrap: Use the new 'derivation' calling convention.
* gnu/packages/bootstrap.scm (raw-build): In 'derivation' call,
distinguish #:inputs from #:sources, passing a list of
<derivation-input> as #:inputs.
| -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 e8b2120551..5030b815b9 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; @@ -29,7 +29,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 (srfi srfi-1) @@ -312,7 +312,8 @@ $out/bin/guile --version~%" (derivation store name bash `(,builder) #:system system - #:inputs `((,bash) (,builder) (,guile)) + #:inputs (list (derivation-input guile)) + #:sources (list bash builder) #:env-vars `(("GUILE_TARBALL" . ,(derivation->output-path guile)))))) |