diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-12-20 23:36:21 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2016-12-21 10:22:32 +0100 |
| commit | b291b3271a025dfe41e1a7fdfadd393373b0128d (patch) | |
| tree | cdc5381b2ff5655c5d594b509a8d75c936830bfd | |
| parent | 62a3179395d5da1352083df77cf9df35531ff381 (diff) | |
| download | gnu-guix-b291b3271a025dfe41e1a7fdfadd393373b0128d.tar gnu-guix-b291b3271a025dfe41e1a7fdfadd393373b0128d.tar.gz | |
gnu: linux-libre: Avoid invalid "kconfig" input on armhf and mips64el.
This fixes a bug whereby:
guix build linux-libre -s armhf-linux
would fail with:
guix build: error: gnu/packages/linux.scm:231:2: package `linux-libre-4.8.15' has an invalid input: ("kconfig" #f)
This led 'tests/guix-system.sh' to fail.
* gnu/packages/linux.scm (make-linux-libre)[native-inputs]: Never add #f
as a "kconfig" input.
| -rw-r--r-- | gnu/packages/linux.scm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 827ee8b37c..5d6fbbb148 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -242,13 +242,15 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ("bc" ,bc) ("openssl" ,openssl) ("kmod" ,kmod) - ,@(if configuration-file - `(("kconfig" ,(configuration-file - (system->linux-architecture - (or (%current-target-system) - (%current-system))) - #:variant (version-major+minor version)))) - '()))) + ,@(match (and configuration-file + (configuration-file + (system->linux-architecture + (or (%current-target-system) (%current-system))) + #:variant (version-major+minor version))) + (#f ;no config for this platform + '()) + ((? string? config) + `(("kconfig" ,config)))))) (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) |