diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-05-25 15:35:36 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-05-25 15:35:36 +0200 |
| commit | ee4d7368818288f93afdcb80d696cc859b2106c8 (patch) | |
| tree | 1cc7d7971fb57ed97343bfbc633990bbe2faf4b8 | |
| parent | 2ee5f56b4d0a5913632ae9a2075b9645e704f7e2 (diff) | |
| download | guix-ee4d7368818288f93afdcb80d696cc859b2106c8.tar guix-ee4d7368818288f93afdcb80d696cc859b2106c8.tar.gz | |
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.
| -rw-r--r-- | guix/build-system/gnu.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 4d06a8b583..86c49a6d6e 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -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)) |