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

* Load the wis-go7007 firmware automatically.

Browse Source 
svn path=/nixos/trunk/; revision=12170
This commit is contained in:
Eelco Dolstra 2008-06-20 16:10:20 +00:00
parent 1ec810f844
commit 91e2083d32
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/system.nix
View File

@ -54,7 +54,7 @@ rec {
# !!! 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
++ (config.boot.extraModulePackages pkgs) ++ config.boot.extraModulePackages pkgs
); );

3
upstart-jobs/default.nix
View File

@ -95,10 +95,11 @@ let
++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode
++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi4965ucode ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi4965ucode
++ pkgs.lib.optional config.networking.enableZydasZD1211Firmware pkgs.zd1211fw ++ pkgs.lib.optional config.networking.enableZydasZD1211Firmware pkgs.zd1211fw
++ pkgs.lib.optional config.hardware.enableGo7007 "${kernelPackages.wis_go7007}/firmware"
++ 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
++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007; ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007;
sndMode = config.services.udev.sndMode; sndMode = config.services.udev.sndMode;
}) })