nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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