ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-25 20:19:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guile-bootstrap: Use the new 'derivation' calling convention.

Browse source 
* gnu/packages/bootstrap.scm (raw-build): In 'derivation' call,
distinguish #:inputs from #:sources, passing a list of
<derivation-input> as #:inputs.
This commit is contained in:
Ludovic Courtès 2019-07-09 23:21:20 +02:00
parent 3868577480
commit 266e54e2ac
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/bootstrap.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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 © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
@ -29,7 +29,7 @@ (define-module (gnu packages bootstrap)
#:use-module ((guix store) #:use-module ((guix store)
#:select (run-with-store add-to-store add-text-to-store)) #:select (run-with-store add-to-store add-text-to-store))
#:use-module ((guix derivations) #: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 utils) #:select (gnu-triplet->nix-system))
#:use-module (guix memoization) #:use-module (guix memoization)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
@ -312,7 +312,8 @@ (define (->store file)
(derivation store name (derivation store name
bash `(,builder) bash `(,builder)
#:system system #:system system
#:inputs `((,bash) (,builder) (,guile)) #:inputs (list (derivation-input guile))
#:sources (list bash builder)
#:env-vars `(("GUILE_TARBALL" #:env-vars `(("GUILE_TARBALL"
. ,(derivation->output-path guile)))))) . ,(derivation->output-path guile))))))