From 124096e4183780d78108e23c69b501345f4032ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 09:22:00 +0000
Subject: [PATCH] * Remember the original symbolic driver name.

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

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 2d432e831f7d..d58e75bbad94 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -19,12 +19,12 @@ let
     intel        = { modules = [ xorg.xf86videointel ]; };
     nv           = { modules = [ xorg.xf86videonv ]; };
     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 ]; };
     sis          = { modules = [ xorg.xf86videosis ]; };
     unichrome    = { modules = [ pkgs.xorgVideoUnichrome ]; };
     vesa         = { modules = [ xorg.xf86videovesa ]; };
-    virtualbox   = { modules = [ kernelPackages.virtualboxGuestAdditions ]; name = "vboxvideo"; };
+    virtualbox   = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
     vmware       = { modules = [ xorg.xf86videovmware ]; };
   };
 
@@ -32,7 +32,7 @@ let
     optional (cfg.videoDriver != null) cfg.videoDriver ++ cfg.videoDrivers;
 
   drivers = flip map driverNames
-    (name: { inherit name; } //
+    (name: { inherit name; driverName = name; } //
       attrByPath [name] (throw "unknown video driver `${name}'") knownVideoDrivers);
 
 
@@ -453,7 +453,7 @@ in
         
           Section "Device"
             Identifier "Device-${driver.name}[0]"
-            Driver "${driver.name}"
+            Driver "${driver.driverName}"
             ${optionalString (driver.name == "nvidiaLegacy") ''
               # This option allows suspending with a nvidiaLegacy card
               Option "NvAGP" "1"