aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/cross-base.scm
diff options
context:
space:
mode:
authorCarl Dong <contact@carldong.me>2019-05-28 15:57:41 +0000
committerDanny Milosavljevic <dannym@scratchpost.org>2019-05-29 15:44:54 +0200
commit2ea77d48a739eb289f2472d2c30c37a30bbcb571 (patch)
tree003810da699b9954aa1a99748de33e206fed00e6 /gnu/packages/cross-base.scm
parent7180dd671697e0215b140ebc0d36047b4b8375f2 (diff)
downloadguix-2ea77d48a739eb289f2472d2c30c37a30bbcb571.tar
guix-2ea77d48a739eb289f2472d2c30c37a30bbcb571.tar.gz
gnu: cross-base: Allow non-default linux-headers.
* gnu/packages/cross-base.scm (cross-kernel-headers): Add LINUX-HEADERS optional argument. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
Diffstat (limited to 'gnu/packages/cross-base.scm')
-rw-r--r--gnu/packages/cross-base.scm12
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index b3b90a6490..a0341ebc5d 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -39,7 +39,8 @@
#:export (cross-binutils
cross-libc
cross-gcc
- cross-newlib?))
+ cross-newlib?
+ cross-kernel-headers))
(define-syntax %xgcc
;; GCC package used as the basis for cross-compilation. It doesn't have to
@@ -276,18 +277,19 @@ target that libc."
(define* (cross-kernel-headers target
#:optional
+ (linux-headers linux-libre-headers)
(xgcc (cross-gcc target))
(xbinutils (cross-binutils target)))
"Return headers depending on TARGET."
(define xlinux-headers
- (package (inherit linux-libre-headers)
- (name (string-append (package-name linux-libre-headers)
+ (package (inherit linux-headers)
+ (name (string-append (package-name linux-headers)
"-cross-" target))
(arguments
(substitute-keyword-arguments
`(#:implicit-cross-inputs? #f
- ,@(package-arguments linux-libre-headers))
+ ,@(package-arguments linux-headers))
((#:phases phases)
`(alist-replace
'build
@@ -300,7 +302,7 @@ target that libc."
,phases))))
(native-inputs `(("cross-gcc" ,xgcc)
("cross-binutils" ,xbinutils)
- ,@(package-native-inputs linux-libre-headers)))))
+ ,@(package-native-inputs linux-headers)))))
(define xgnumach-headers
(package (inherit gnumach-headers)