From 50902d2e5893cc00f54e3367f740186a79ad6c11 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 13 Oct 2009 13:56:30 +0000
Subject: [PATCH] Added some basic VirtualBox driver support. Input driver and
 dynamic resizing still remains on my todo list

svn path=/nixos/trunk/; revision=17779
---
 modules/services/x11/xserver.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 1cf36e9ad70..f6281d66344 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -25,6 +25,7 @@ let
     openchrome = { modules = [ xorg.xf86videoopenchrome ]; };
     cirrus =     { modules = [ xorg.xf86videocirrus ]; };
     vmware =     { modules = [ xorg.xf86videovmware ]; };
+    vboxvideo =  { modules = [ kernelPackages.virtualboxGuestAdditions ]; };
   };
 
   videoDriver = cfg.videoDriver;
@@ -320,7 +321,8 @@ in
 
     boot.extraModulePackages =
       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
       [ { source = "${configFile}";
@@ -343,7 +345,7 @@ in
       ]
       ++ optional (videoDriver == "nvidia") kernelPackages.nvidia_x11
       ++ optional (videoDriver == "nvidiaLegacy") kernelPackages.nvidia_x11_legacy;
-
+      
     environment.systemPackages = config.environment.x11Packages;
     
     services.hal.packages = halConfigFiles;