diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-02-15 22:10:49 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-02-15 22:10:49 +0300 |
| commit | a13f9a708b872571373632c2d293ce8af3e1fddb (patch) | |
| tree | bbf8cc114c3036f5ce5f707bdfab3ac09e322a3b /nixos | |
| parent | 2029027d8883ab22e3044a71a4a33cc7a0beaf2e (diff) | |
| parent | 0b72e7e2472e381b0168345f2158dfe76afc2ab0 (diff) | |
| download | nixlib-a13f9a708b872571373632c2d293ce8af3e1fddb.tar nixlib-a13f9a708b872571373632c2d293ce8af3e1fddb.tar.gz nixlib-a13f9a708b872571373632c2d293ce8af3e1fddb.tar.bz2 nixlib-a13f9a708b872571373632c2d293ce8af3e1fddb.tar.lz nixlib-a13f9a708b872571373632c2d293ce8af3e1fddb.tar.xz nixlib-a13f9a708b872571373632c2d293ce8af3e1fddb.tar.zst nixlib-a13f9a708b872571373632c2d293ce8af3e1fddb.zip | |
Merge pull request #12992 from lukasepple/master
intel2200BGFirmware: init at 3.1
Diffstat (limited to 'nixos')
| -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 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 ]; }; |