From 0b72e7e2472e381b0168345f2158dfe76afc2ab0 Mon Sep 17 00:00:00 2001 From: lukasepple Date: Sun, 14 Feb 2016 16:34:30 +0100 Subject: intel2200BGFirmware: init at 3.1 This commit adds the firmware for the Intel 2200BG wireless cards for the ipw2200 kernel module. Also it changes the networking.enableIntel2200BGFirmware option to set it as hardware.firmware since firmware-linux-nonfree does not contain the appropiate firmware anymore. Also hardware.enableAllFirmware does enable the intel2200BGFirmware now. --- nixos/modules/hardware/all-firmware.nix | 2 +- nixos/modules/hardware/network/intel-2200bg.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 1a04baef1930..d0d481f72a40 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -22,7 +22,7 @@ with lib; ###### implementation config = mkIf config.hardware.enableAllFirmware { - hardware.firmware = [ pkgs.firmwareLinuxNonfree ]; + hardware.firmware = [ pkgs.firmwareLinuxNonfree pkgs.intel2200BGFirmware ]; }; } diff --git a/nixos/modules/hardware/network/intel-2200bg.nix b/nixos/modules/hardware/network/intel-2200bg.nix index 1b70057d135b..17b973474c93 100644 --- a/nixos/modules/hardware/network/intel-2200bg.nix +++ b/nixos/modules/hardware/network/intel-2200bg.nix @@ -23,7 +23,7 @@ config = lib.mkIf config.networking.enableIntel2200BGFirmware { - hardware.enableAllFirmware = true; + hardware.firmware = [ pkgs.intel2200BGFirmware ]; }; -- cgit 1.4.1