public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for Intel's 4965AGN firmware.

Browse Source 
svn path=/nixos/trunk/; revision=10735
This commit is contained in:
Ludovic Courtès 2008-02-18 16:50:08 +00:00
parent bbbef0f2fa
commit 5122633592
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
system/options.nix
View File

@ -376,7 +376,15 @@
default = false; default = false;
description = " description = "
This option enables automatic loading of the firmware for the Intel This option enables automatic loading of the firmware for the Intel
PRO/Wireless 3945ABG / 4965AGN. PRO/Wireless 3945ABG.
";
};
enableIntel4965AGNFirmware = mkOption {
default = false;
description = "
This option enables automatic loading of the firmware for the Intel
PRO/Wireless 4965AGN.
"; ";
}; };

1
system/system.nix
View File

@ -140,6 +140,7 @@ rec {
modulesTree = pkgs.module_aggregation ( modulesTree = pkgs.module_aggregation (
[kernel] [kernel]
++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi
++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi
# !!! this should be declared by the xserver Upstart job. # !!! this should be declared by the xserver Upstart job.
++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers
++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007 ++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007

1
upstart-jobs/default.nix
View File

@ -28,6 +28,7 @@ let
firmwareDirs = firmwareDirs =
pkgs.lib.optional config.networking.enableIntel2200BGFirmware pkgs.ipw2200fw pkgs.lib.optional config.networking.enableIntel2200BGFirmware pkgs.ipw2200fw
++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode
++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi4965ucode
++ config.services.udev.addFirmware; ++ config.services.udev.addFirmware;
extraUdevPkgs = extraUdevPkgs =
pkgs.lib.optional config.services.hal.enable pkgs.hal pkgs.lib.optional config.services.hal.enable pkgs.hal