~ruther/guix-local: build-system/gnu: Make sure build input variables contain pairs.

ee4d7368818288f93afdcb80d696cc859b2106c8 — Ludovic Courtès 12 years ago 2ee5f56

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.

patch browse .tar.gz

1 files changed, 4 insertions(+), 2 deletions(-)

M guix/build-system/gnu.scm

M guix/build-system/gnu.scm => guix/build-system/gnu.scm +4 -2

@@ 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))