summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-12-20 23:36:21 +0100
committerLudovic Courtès <ludo@gnu.org>2016-12-20 23:39:30 +0100
commit64b5e4137649be75c6f4ea37991be95a23844a95 (patch)
treeda561def42e811cf49e114eca7861e5ca1522600
parent899358d18a0bf5347d3232a724b035a521d2c30c (diff)
downloadpatches-64b5e4137649be75c6f4ea37991be95a23844a95.tar
patches-64b5e4137649be75c6f4ea37991be95a23844a95.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.scm16
1 files changed, 9 insertions, 7 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 78fab4e186..799d00f045 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -245,13 +245,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)