Move common firmware to separate module

1 files changed, 1 insertions, 24 deletions

diff --git a/tw/system/frm.scm b/tw/system/frm.scm
index 2c1c5054..6d143e53 100644
--- a/tw/system/frm.scm
+++ b/tw/system/frm.scm
@@ -26,6 +26,7 @@
   #:use-module ((nonguix licenses)
                 #:prefix nongnu:)
   #:use-module (tw channels)
+  #:use-module (tw packages firmware)
   #:use-module (tw services secrets)
   #:use-module (tw system))
 
@@ -34,30 +35,6 @@
 (define root-partition                ; /dev/nvme0n1p2
   (uuid "62fb4710-33d1-4eaf-aaaa-43d16ab26a58" 'btrfs))
 
-(define select-firmware
-  (@@ (nongnu packages linux) select-firmware))
-
-(define-public mt7922-firmware
-  (package
-    (inherit nongnu:linux-firmware)
-    (name "mt7922-firmware")
-    (arguments
-     `(#:license-file-regexp "LICENSE.mediatek"
-       ,@(substitute-keyword-arguments (package-arguments nongnu:linux-firmware)
-           ((#:phases phases)
-            `(modify-phases ,phases
-               (add-after 'unpack 'select-firmware
-                 ,(select-firmware "^mediatek/.*7922.*")))))))
-    (home-page "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/mediatek")
-    (synopsis "Nonfree firmware for Mediatek MT7922 (AMD RZ616) wireless chips")
-    (description "Nonfree firmware for AMD RZ616 Wi-Fi and Bluetooth chips.
-These are actually Mediatek MT7922 chips.")
-    (license
-     (nongnu:nonfree
-      (string-append
-       "https://git.kernel.org/pub/scm/linux/kernel/git/firmware"
-       "/linux-firmware.git/plain/LICENSE.mediatek")))))
-
 (define-public %frm-system
   (operating-system
     (host-name "frm.twilken.net")