From ec60e56b26377cd42bdb226b5b6b4a08cb531bd0 Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Fri, 28 Jun 2024 09:13:55 +0200
Subject: [PATCH] rtw88-firmware: drop

It's all part of linux-firmware now.
---
 nixos/modules/hardware/all-firmware.nix       |  1 -
 .../linux/firmware/rtw88-firmware/default.nix | 25 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 4 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/firmware/rtw88-firmware/default.nix

diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index a97c8c418c86..abad6e08611f 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -43,7 +43,6 @@ in {
         rtl8192su-firmware
         rt5677-firmware
         rtl8761b-firmware
-        rtw88-firmware
         zd1211fw
         alsa-firmware
         sof-firmware
diff --git a/pkgs/os-specific/linux/firmware/rtw88-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtw88-firmware/default.nix
deleted file mode 100644
index b4e07624b6ef..000000000000
--- a/pkgs/os-specific/linux/firmware/rtw88-firmware/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenvNoCC, lib, linuxPackages }:
-
-stdenvNoCC.mkDerivation {
-  pname = "rtw88-firmware";
-  inherit (linuxPackages.rtw88) version src;
-
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/lib/firmware/rtw88
-    cp *.bin $out/lib/firmware/rtw88
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Firmware for the newest Realtek rtlwifi codes";
-    homepage = "https://github.com/lwfinger/rtw88";
-    license = licenses.unfreeRedistributableFirmware;
-    maintainers = with maintainers; [ tvorog ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d7cf6ef30692..d5a1e367f006 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1182,6 +1182,7 @@ mapAliases ({
   # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix,
   # due to it being inside the linuxPackagesFor function.
   rtlwifi_new-firmware = rtw88-firmware; # Added 2021-03-14
+  rtw88-firmware = throw "rtw88-firmware has been removed because linux-firmware now contains it."; # Added 2024-06-28
   rtw89-firmware = throw "rtw89-firmware has been removed because linux-firmware now contains it."; # Added 2023-02-19
 
   ### S ###
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f06962f5fad6..4711b9917d89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27766,8 +27766,6 @@ with pkgs;
 
   rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { };
 
-  rtw88-firmware = callPackage ../os-specific/linux/firmware/rtw88-firmware { };
-
   rvvm = callPackage ../applications/virtualization/rvvm { };
 
   s3ql = callPackage ../tools/backup/s3ql { };