diff options
| author | lukasepple <git@lukasepple.de> | 2016-02-14 16:34:30 +0100 |
|---|---|---|
| committer | lukasepple <git@lukasepple.de> | 2016-02-15 19:53:07 +0100 |
| commit | 0b72e7e2472e381b0168345f2158dfe76afc2ab0 (patch) | |
| tree | 55931881e3edd7ce2a9c539a974e6b7c3f9416af /nixos/modules/hardware | |
| parent | 400ade95ff735b5d9a58617edc85db2d7a1ddb1f (diff) | |
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.
Diffstat (limited to 'nixos/modules/hardware')
| -rw-r--r-- | nixos/modules/hardware/all-firmware.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/hardware/network/intel-2200bg.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 1a04baef1930b..d0d481f72a40e 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 1b70057d135bd..17b973474c93b 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 ]; }; |