From ada9bbca1cffbe8d63ca83a3c2d5c3f7d94c1886 Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Fri, 23 May 2025 15:06:55 +0800
Subject: nongnu: corrupt-linux: Apply Guix modifications.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up to commit 7ac8fe6e2aaa1e93db6d916fbadcfb40d6ecac73, which
only applies Nonguix modifications to kernel configuration.

* nongnu/packages/linux.scm (corrupt-linux): Modify freedo phases first and
use ‘customize-linux’ later.
---
 nongnu/packages/linux.scm | 58 ++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

(limited to 'nongnu/packages/linux.scm')

diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm
index e23f824..5b70405 100644
--- a/nongnu/packages/linux.scm
+++ b/nongnu/packages/linux.scm
@@ -131,35 +131,37 @@ some freedo package or an output of package-version procedure."
          (pristine-source (package-source freedo))
          (inputs (map gexp-input-thing (extract-gexp-inputs pristine-source)))
          (sources (filter origin? inputs))
-         (hash (find-source-hash sources url))
-         (base (customize-linux
-                #:name name
-                #:linux freedo
-                #:source (origin
-                           (method url-fetch)
-                           (uri url)
-                           (hash hash))
-                #:configs configs
-                #:defconfig defconfig)))
+         (hash (find-source-hash sources url)))
     (package
-      (inherit base)
-      (version version)
-      (arguments
-       (substitute-keyword-arguments (package-arguments base)
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              ;; Make sure the resulted package is compatible with
-              ;; ‘customize-linux’.
-              (add-before 'configure 'nonguix-configure
-                (lambda _
-                  (let ((defconfig
-                          (format #f "arch/~a/configs/nonguix_defconfig"
-                                  #$(linux-srcarch))))
-                    (invoke "make" "defconfig")
-                    (modify-defconfig
-                     ".config" '#$(get-extra-configs this-package))
-                    (invoke "make" "savedefconfig")
-                    (rename-file "defconfig" defconfig))))))))
+      (inherit
+       (customize-linux
+        #:name name
+        #:linux
+        (package
+          (inherit freedo)
+          (version version)
+          (arguments
+           (substitute-keyword-arguments (package-arguments freedo)
+             ((#:phases phases '%standard-phases)
+              #~(modify-phases #$phases
+                  ;; Make sure the resulted package is compatible with
+                  ;; ‘customize-linux’.
+                  (add-before 'configure 'nonguix-configure
+                    (lambda args
+                      (let ((defconfig
+                             (format #f "arch/~a/configs/nonguix_defconfig"
+                                     #$(linux-srcarch))))
+                        (apply (assoc-ref #$phases 'configure) args)
+                        (modify-defconfig
+                         ".config" '#$(get-extra-configs this-package))
+                        (invoke "make" "savedefconfig")
+                        (rename-file "defconfig" defconfig)))))))))
+        #:source (origin
+                   (method url-fetch)
+                   (uri url)
+                   (hash hash))
+        #:configs configs
+        #:defconfig defconfig))
       (home-page "https://www.kernel.org/")
       (synopsis "Linux kernel with nonfree binary blobs included")
       (description
-- 
cgit v1.2.3