Author: shlevy
Date: Mon Mar 19 23:57:26 2012
New Revision: 33281
URL: https://nixos.org/websvn/nix/?rev=33281&sc=1
Log:
xserver.nix: Automatically support xorg's own video drivers
Modified:
nixos/trunk/modules/services/x11/xserver.nix
Modified: nixos/trunk/modules/services/x11/xserver.nix
==============================================================================
--- nixos/trunk/modules/services/x11/xserver.nix Mon Mar 19 23:41:06
2012 (r33280)
+++ nixos/trunk/modules/services/x11/xserver.nix Mon Mar 19 23:57:26
2012 (r33281)
@@ -13,21 +13,12 @@
# Map video driver names to driver packages.
knownVideoDrivers = {
- ati = { modules = [ xorg.xf86videoati ]; };
ati_unfree = { modules = [ kernelPackages.ati_drivers_x11 ]; driverName
= "fglrx"; };
- cirrus = { modules = [ xorg.xf86videocirrus ]; };
- i810 = { modules = [ xorg.xf86videoi810 ]; };
- intel = { modules = [ xorg.xf86videointel ]; };
- nv = { modules = [ xorg.xf86videonv ]; };
nvidia = { modules = [ kernelPackages.nvidia_x11 ]; };
nvidiaLegacy96 = { modules = [ kernelPackages.nvidia_x11_legacy96 ];
driverName = "nvidia"; };
nvidiaLegacy173 = { modules = [ kernelPackages.nvidia_x11_legacy173 ];
driverName = "nvidia"; };
- openchrome = { modules = [ xorg.xf86videoopenchrome ]; };
- sis = { modules = [ xorg.xf86videosis ]; };
unichrome = { modules = [ pkgs.xorgVideoUnichrome ]; };
- vesa = { modules = [ xorg.xf86videovesa ]; };
virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ];
driverName = "vboxvideo"; };
- vmware = { modules = [ xorg.xf86videovmware ]; };
};
driverNames =
@@ -35,7 +26,7 @@
drivers = flip map driverNames
(name: { inherit name; driverName = name; } //
- attrByPath [name] (throw "unknown video driver `${name}'")
knownVideoDrivers);
+ attrByPath [name] (if (hasAttr ("xf86video" + name) xorg) then { modules
= [(getAttr ("xf86video" + name) xorg) ]; } else throw "unknown video driver
`${name}'") knownVideoDrivers);
fontsForXServer =
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
