From 64b5e4137649be75c6f4ea37991be95a23844a95 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 20 Dec 2016 23:36:21 +0100 Subject: 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. --- gnu/packages/linux.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu') 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) -- cgit v1.2.3