Made iwlwifi optional, with false default

svn path=/nixos/trunk/; revision=10288
This commit is contained in:
Yury G. Kudryashov 2008-01-25 12:54:27 +00:00
parent 01004362f2
commit 3166d9f687
2 changed files with 3 additions and 2 deletions

View file

@ -341,7 +341,7 @@
}; };
enableIntel3945ABGFirmware = mkOption { enableIntel3945ABGFirmware = mkOption {
default = true; 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. PRO/Wireless 3945ABG.

View file

@ -147,7 +147,8 @@ rec {
# single tree of symlinks because modprobe only supports one # single tree of symlinks because modprobe only supports one
# directory. # directory.
modulesTree = pkgs.module_aggregation ( modulesTree = pkgs.module_aggregation (
[kernel pkgs.iwlwifi] [kernel]
++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware 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
); );