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

Fixing build for new kernels when Intel WiFi firmware is used

Browse Source 
svn path=/nixos/trunk/; revision=13470
This commit is contained in:
Michael Raskin 2008-11-27 20:35:26 +00:00
parent 3919a28971
commit 7ebc1821f9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
system/system.nix
View File

@ -43,7 +43,8 @@ rec {
# directory. # directory.
modulesTree = pkgs.aggregateModules ( modulesTree = pkgs.aggregateModules (
[kernel] [kernel]
++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi # Merged into mainline kernel
# ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.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") kernelPackages.nvidiaDrivers ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007 ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007