diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-06-25 23:04:32 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-06-25 23:04:32 +0200 |
commit | a3cff41dd1fbc1c860d9984c8e5666d02e0f07de (patch) | |
tree | 70b937f8ae52e2434ce84f1dba84affee1cc59e2 | |
parent | 0de71c233cb1d4fdea1d41bfe8a39be778502d81 (diff) | |
download | guix-a3cff41dd1fbc1c860d9984c8e5666d02e0f07de.tar guix-a3cff41dd1fbc1c860d9984c8e5666d02e0f07de.tar.gz |
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.
-rw-r--r-- | guix/build-system/gnu.scm | 6 |
1 files changed, 5 insertions, 1 deletions
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) |