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

Added some basic VirtualBox driver support. Input driver and dynamic resizing still remains on my todo list

Browse Source 
svn path=/nixos/trunk/; revision=17779
This commit is contained in:
Sander van der Burg 2009-10-13 13:56:30 +00:00
parent 1581d91330
commit 50902d2e58
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +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 ]; };
}; };
videoDriver = cfg.videoDriver; videoDriver = cfg.videoDriver;
@ -320,7 +321,8 @@ 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;
environment.etc = optionals cfg.exportConfiguration environment.etc = optionals cfg.exportConfiguration
[ { source = "${configFile}"; [ { source = "${configFile}";
@ -343,7 +345,7 @@ in
] ]
++ optional (videoDriver == "nvidia") kernelPackages.nvidia_x11 ++ optional (videoDriver == "nvidia") kernelPackages.nvidia_x11
++ optional (videoDriver == "nvidiaLegacy") kernelPackages.nvidia_x11_legacy; ++ optional (videoDriver == "nvidiaLegacy") kernelPackages.nvidia_x11_legacy;
environment.systemPackages = config.environment.x11Packages; environment.systemPackages = config.environment.x11Packages;
services.hal.packages = halConfigFiles; services.hal.packages = halConfigFiles;