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

Changed vboxvideo identifier to virtualbox for clarity

Browse Source 
svn path=/nixos/trunk/; revision=17816
This commit is contained in:
Sander van der Burg 2009-10-15 09:31:30 +00:00
parent 6472ee4d20
commit f57f344996
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ let
openchrome = { modules = [ xorg.xf86videoopenchrome ]; }; openchrome = { modules = [ xorg.xf86videoopenchrome ]; };
cirrus = { modules = [ xorg.xf86videocirrus ]; }; cirrus = { modules = [ xorg.xf86videocirrus ]; };
vmware = { modules = [ xorg.xf86videovmware ]; }; vmware = { modules = [ xorg.xf86videovmware ]; };
vboxvideo = { modules = [ kernelPackages.virtualboxGuestAdditions ]; }; virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; };
}; };
videoDriver = cfg.videoDriver; videoDriver = cfg.videoDriver;
@ -322,7 +322,7 @@ in
boot.extraModulePackages = boot.extraModulePackages =
optional (cfg.videoDriver == "nvidia") kernelPackages.nvidia_x11 ++ optional (cfg.videoDriver == "nvidia") kernelPackages.nvidia_x11 ++
optional (cfg.videoDriver == "nvidiaLegacy") kernelPackages.nvidia_x11_legacy ++ optional (cfg.videoDriver == "nvidiaLegacy") kernelPackages.nvidia_x11_legacy ++
optional (cfg.videoDriver == "vboxvideo") kernelPackages.virtualboxGuestAdditions; optional (cfg.videoDriver == "virtualbox") kernelPackages.virtualboxGuestAdditions;
environment.etc = optionals cfg.exportConfiguration environment.etc = optionals cfg.exportConfiguration
[ { source = "${configFile}"; [ { source = "${configFile}";
@ -349,7 +349,7 @@ in
environment.systemPackages = config.environment.x11Packages; environment.systemPackages = config.environment.x11Packages;
services.hal.packages = halConfigFiles ++ services.hal.packages = halConfigFiles ++
optional (videoDriver == "vboxvideo") kernelPackages.virtualboxGuestAdditions; optional (videoDriver == "virtualbox") kernelPackages.virtualboxGuestAdditions;
jobs.xserver = jobs.xserver =
{ startOn = if cfg.autorun then "hal" else "never"; { startOn = if cfg.autorun then "hal" else "never";
@ -446,7 +446,7 @@ in
Option "RandRRotation" "on" Option "RandRRotation" "on"
''} ''}
${if cfg.videoDriver != "vboxvideo" then ${if cfg.videoDriver != "virtualbox" then
let let
f = depth: f = depth:
'' ''
@ -484,7 +484,9 @@ in
services.xserver.deviceSection = services.xserver.deviceSection =
'' ''
Identifier "Device[0]" Identifier "Device[0]"
Driver "${if cfg.videoDriver == "nvidiaLegacy" then "nvidia" else cfg.videoDriver}" Driver "${if cfg.videoDriver == "nvidiaLegacy" then "nvidia"
else if cfg.videoDriver == "virtualbox" then "vboxvideo"
else cfg.videoDriver}"
${if cfg.videoDriver == "nvidiaLegacy" then '' ${if cfg.videoDriver == "nvidiaLegacy" then ''
# This option allows suspending with a nvidiaLegacy card # This option allows suspending with a nvidiaLegacy card