nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2016-12-20 23:36:21 +01:00
parent 899358d18a
commit 64b5e41376
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/linux.scm
View File

@ -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)