diff mbox series

[bug#35963] gnu: cross-base: Allow non-default linux-headers.

Message ID Q3-WI0U_hrsxg6Dz3P-DmcBd3NMBtMF7QJFBqpb9srZmCs0SylCdhylXI2miSlgMXIDG469m-7abfvwAzPRD7g700z3hAzOqBUC3zyXXRnc=@carldong.me
State Accepted
Headers show
Series [bug#35963] gnu: cross-base: Allow non-default linux-headers. | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

Carl Dong May 28, 2019, 3:57 p.m. UTC 
* gnu/packages/cross-base.scm (cross-kernel-headers): Add
  'linux-headers' optional argument to specify using a non-default
  linux-kernel package.
---
 gnu/packages/cross-base.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Comments

Danny Milosavljevic May 29, 2019, 1:45 p.m. UTC | #1 
Thanks!

Pushed to guix master as commit 2ea77d48a739eb289f2472d2c30c37a30bbcb571.
diff mbox series

Patch

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)