From 4bc73f3ecedce00c404f7433ed4654c0ef459b4b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Aug 2013 03:27:02 +0200 Subject: [PATCH] Use the Debian firmware package in more places --- modules/hardware/network/broadcom-43xx.nix | 4 +--- modules/hardware/network/ralink.nix | 2 +- modules/hardware/network/rtl8192c.nix | 2 +- modules/hardware/video/radeon.nix | 4 +--- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/hardware/network/broadcom-43xx.nix b/modules/hardware/network/broadcom-43xx.nix index f902babc4f63..8fecdae36bf2 100644 --- a/modules/hardware/network/broadcom-43xx.nix +++ b/modules/hardware/network/broadcom-43xx.nix @@ -1,5 +1,3 @@ -{ config, pkgs, ... }: - { - hardware.firmware = [ pkgs.bcm43xx ]; + hardware.enableAllFirmware = true; } diff --git a/modules/hardware/network/ralink.nix b/modules/hardware/network/ralink.nix index 5924a23fe3c3..d5e195cc90ad 100644 --- a/modules/hardware/network/ralink.nix +++ b/modules/hardware/network/ralink.nix @@ -20,7 +20,7 @@ ###### implementation config = pkgs.lib.mkIf config.networking.enableRalinkFirmware { - hardware.firmware = [ pkgs.ralink_fw ]; + hardware.enableAllFirmware = true; }; } diff --git a/modules/hardware/network/rtl8192c.nix b/modules/hardware/network/rtl8192c.nix index aeb573fb0ea6..3aefb7bdd608 100644 --- a/modules/hardware/network/rtl8192c.nix +++ b/modules/hardware/network/rtl8192c.nix @@ -20,7 +20,7 @@ ###### implementation config = pkgs.lib.mkIf config.networking.enableRTL8192cFirmware { - hardware.firmware = [ pkgs.rtl8192cfw ]; + hardware.enableAllFirmware = true; }; } diff --git a/modules/hardware/video/radeon.nix b/modules/hardware/video/radeon.nix index 8836cff8a842..8fecdae36bf2 100644 --- a/modules/hardware/video/radeon.nix +++ b/modules/hardware/video/radeon.nix @@ -1,5 +1,3 @@ -{ config, pkgs, ... }: - { - hardware.firmware = [ pkgs.radeonR600 pkgs.radeonR700 pkgs.radeonJuniper ]; + hardware.enableAllFirmware = true; }