From a3cff41dd1fbc1c860d9984c8e5666d02e0f07de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 25 Jun 2013 23:04:32 +0200 Subject: build-system/gnu: `package-with-explicit-inputs' skips non-GBS packages. * guix/build-system/gnu.scm (package-with-explicit-inputs)[rewritten-input]: Leave P unchanged if its build system is not GNU-BUILD-SYSTEM. --- guix/build-system/gnu.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 434a6dd5e0..d074294b4c 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -72,7 +72,11 @@ builder, or the distro's final Guile when GUILE is #f." (memoize (match-lambda ((name (? package? p) sub-drv ...) - (cons* name (loop p) sub-drv)) + ;; XXX: Check whether P's build system knows #:implicit-inputs, for + ;; things like `cross-pkg-config'. + (if (eq? (package-build-system p) gnu-build-system) + (cons* name (loop p) sub-drv) + (cons* name p sub-drv))) (x x)))) (package (inherit p) -- cgit v1.2.3