diff options
author | Carl Dong <contact@carldong.me> | 2019-05-28 15:57:41 +0000 |
---|---|---|
committer | Danny Milosavljevic <dannym@scratchpost.org> | 2019-05-29 15:44:54 +0200 |
commit | 2ea77d48a739eb289f2472d2c30c37a30bbcb571 (patch) | |
tree | 003810da699b9954aa1a99748de33e206fed00e6 /gnu/packages | |
parent | 7180dd671697e0215b140ebc0d36047b4b8375f2 (diff) | |
download | guix-2ea77d48a739eb289f2472d2c30c37a30bbcb571.tar.gz guix-2ea77d48a739eb289f2472d2c30c37a30bbcb571.zip |
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')
-rw-r--r-- | gnu/packages/cross-base.scm | 12 |
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) |