diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-05-12 15:17:51 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-05-12 15:17:51 +0000 |
| commit | 85d792a92894ded8346ae3b775cca47d23d37b73 (patch) | |
| tree | b89632f14f8b825cba7434e0004ae56b5367a90f /nixos | |
| parent | e2456aed84d8c42c2098d48f9529d7949040230e (diff) | |
nixos: don't put non-firmware in hardware.firmware
These two packages don't have a lib/firmware directory, so putting them in hardware.firmware has no effect. This will become a hard error once firmware compression is implemented. (In the case of Linux, the firmware was all moved to linux-firmware.)
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/hardware/all-firmware.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/system/boot/kernel.nix | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index da2bc8ffef4b0..89a1217dfb313 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -83,7 +83,6 @@ in { broadcom-bt-firmware b43Firmware_5_1_138 b43Firmware_6_30_163_46 - b43FirmwareCutter xow_dongle-firmware ] ++ optionals pkgs.stdenv.hostPlatform.isx86 [ facetimehd-calibration diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index fad00e39497d9..b2c92a85f7abb 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -273,9 +273,6 @@ in boot.kernelModules = [ "loop" "atkbd" ]; - # The Linux kernel >= 2.6.27 provides firmware. - hardware.firmware = [ kernel ]; - # Create /etc/modules-load.d/nixos.conf, which is read by # systemd-modules-load.service to load required kernel modules. environment.etc = |