diff options
| author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2009-10-15 09:31:30 +0000 |
|---|---|---|
| committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2009-10-15 09:31:30 +0000 |
| commit | f57f344996275a5596f8393320d1c704d1c808b9 (patch) | |
| tree | b7978ee8ee2fcfd3c81b66c8a67dcfda3f994798 /modules/services/x11/xserver.nix | |
| parent | 6472ee4d20b7f3b9ff2c3ad19811a62eb3db8c39 (diff) | |
| download | nixlib-f57f344996275a5596f8393320d1c704d1c808b9.tar nixlib-f57f344996275a5596f8393320d1c704d1c808b9.tar.gz nixlib-f57f344996275a5596f8393320d1c704d1c808b9.tar.bz2 nixlib-f57f344996275a5596f8393320d1c704d1c808b9.tar.lz nixlib-f57f344996275a5596f8393320d1c704d1c808b9.tar.xz nixlib-f57f344996275a5596f8393320d1c704d1c808b9.tar.zst nixlib-f57f344996275a5596f8393320d1c704d1c808b9.zip | |
Changed vboxvideo identifier to virtualbox for clarity
svn path=/nixos/trunk/; revision=17816
Diffstat (limited to 'modules/services/x11/xserver.nix')
| -rw-r--r-- | modules/services/x11/xserver.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index e5a3db74220c..6b66cf57b939 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -25,7 +25,7 @@ let openchrome = { modules = [ xorg.xf86videoopenchrome ]; }; cirrus = { modules = [ xorg.xf86videocirrus ]; }; vmware = { modules = [ xorg.xf86videovmware ]; }; - vboxvideo = { modules = [ kernelPackages.virtualboxGuestAdditions ]; }; + virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; }; }; videoDriver = cfg.videoDriver; @@ -322,7 +322,7 @@ in boot.extraModulePackages = optional (cfg.videoDriver == "nvidia") kernelPackages.nvidia_x11 ++ 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 [ { source = "${configFile}"; @@ -349,7 +349,7 @@ in environment.systemPackages = config.environment.x11Packages; services.hal.packages = halConfigFiles ++ - optional (videoDriver == "vboxvideo") kernelPackages.virtualboxGuestAdditions; + optional (videoDriver == "virtualbox") kernelPackages.virtualboxGuestAdditions; jobs.xserver = { startOn = if cfg.autorun then "hal" else "never"; @@ -446,7 +446,7 @@ in Option "RandRRotation" "on" ''} - ${if cfg.videoDriver != "vboxvideo" then + ${if cfg.videoDriver != "virtualbox" then let f = depth: '' @@ -484,7 +484,9 @@ in services.xserver.deviceSection = '' 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 '' # This option allows suspending with a nvidiaLegacy card |