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

* Remember the original symbolic driver name.

Browse Source 
svn path=/nixos/trunk/; revision=18185
This commit is contained in:
Eelco Dolstra 2009-11-06 09:22:00 +00:00
parent 194a24bcf1
commit 124096e418
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/services/x11/xserver.nix
View File

@ -19,12 +19,12 @@ let
intel = { modules = [ xorg.xf86videointel ]; }; intel = { modules = [ xorg.xf86videointel ]; };
nv = { modules = [ xorg.xf86videonv ]; }; nv = { modules = [ xorg.xf86videonv ]; };
nvidia = { modules = [ kernelPackages.nvidia_x11 ]; }; nvidia = { modules = [ kernelPackages.nvidia_x11 ]; };
nvidiaLegacy = { modules = [ kernelPackages.nvidia_x11_legacy ]; name = "nvidia"; }; nvidiaLegacy = { modules = [ kernelPackages.nvidia_x11_legacy ]; driverName = "nvidia"; };
openchrome = { modules = [ xorg.xf86videoopenchrome ]; }; openchrome = { modules = [ xorg.xf86videoopenchrome ]; };
sis = { modules = [ xorg.xf86videosis ]; }; sis = { modules = [ xorg.xf86videosis ]; };
unichrome = { modules = [ pkgs.xorgVideoUnichrome ]; }; unichrome = { modules = [ pkgs.xorgVideoUnichrome ]; };
vesa = { modules = [ xorg.xf86videovesa ]; }; vesa = { modules = [ xorg.xf86videovesa ]; };
virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; name = "vboxvideo"; }; virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
vmware = { modules = [ xorg.xf86videovmware ]; }; vmware = { modules = [ xorg.xf86videovmware ]; };
}; };
@ -32,7 +32,7 @@ let
optional (cfg.videoDriver != null) cfg.videoDriver ++ cfg.videoDrivers; optional (cfg.videoDriver != null) cfg.videoDriver ++ cfg.videoDrivers;
drivers = flip map driverNames drivers = flip map driverNames
(name: { inherit name; } // (name: { inherit name; driverName = name; } //
attrByPath [name] (throw "unknown video driver `${name}'") knownVideoDrivers); attrByPath [name] (throw "unknown video driver `${name}'") knownVideoDrivers);
@ -453,7 +453,7 @@ in
Section "Device" Section "Device"
Identifier "Device-${driver.name}[0]" Identifier "Device-${driver.name}[0]"
Driver "${driver.name}" Driver "${driver.driverName}"
${optionalString (driver.name == "nvidiaLegacy") '' ${optionalString (driver.name == "nvidiaLegacy") ''
# This option allows suspending with a nvidiaLegacy card # This option allows suspending with a nvidiaLegacy card
Option "NvAGP" "1" Option "NvAGP" "1"