ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-26 12:39:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system/gnu: Make sure build input variables contain pairs.

Browse source 
* guix/build-system/gnu.scm (gnu-cross-build)[builder]: Make sure
  %build-host-inputs and %build-target-inputs always contain pairs, not
  lists.
This commit is contained in:
Ludovic Courtès 2013-05-25 15:35:36 +02:00
parent 2ee5f56b4d
commit ee4d736881
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
guix/build-system/gnu.scm
View file

@ -384,7 +384,8 @@ (define %build-host-inputs
((name (? derivation-path? drv-path) sub ...) ((name (? derivation-path? drv-path) sub ...)
`(,name . ,(apply derivation-path->output-path `(,name . ,(apply derivation-path->output-path
drv-path sub))) drv-path sub)))
(x x)) ((name path)
`(,name . ,path)))
(append (or implicit-host-inputs '()) native-inputs))) (append (or implicit-host-inputs '()) native-inputs)))
(define %build-target-inputs (define %build-target-inputs
@ -392,7 +393,8 @@ (define %build-target-inputs
((name (? derivation-path? drv-path) sub ...) ((name (? derivation-path? drv-path) sub ...)
`(,name . ,(apply derivation-path->output-path `(,name . ,(apply derivation-path->output-path
drv-path sub))) drv-path sub)))
(x x)) ((name path)
`(,name . ,path)))
(append (or implicit-target-inputs) inputs))) (append (or implicit-target-inputs) inputs)))
(gnu-build #:source ,(if (and source (derivation-path? source)) (gnu-build #:source ,(if (and source (derivation-path? source))