From ee4d7368818288f93afdcb80d696cc859b2106c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 25 May 2013 15:35:36 +0200 Subject: [PATCH] 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. --- guix/build-system/gnu.scm | 6 ++++-- 1 file 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))