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

adding initial support for proprietary ati drivers You have to add some impure paths, see: http://thread.gmane.org/gmane.linux.distributions.nixos/4145

Browse Source 
svn path=/nixos/trunk/; revision=21847
This commit is contained in:
Marc Weber 2010-05-18 19:36:11 +00:00
parent 7d6db6ac0c
commit 674d396576
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ let
# Map video driver names to driver packages. # Map video driver names to driver packages.
knownVideoDrivers = { knownVideoDrivers = {
ati = { modules = [ xorg.xf86videoati ]; }; ati = { modules = [ xorg.xf86videoati ]; };
ati_unfree = { modules = [ kernelPackages.ati_drivers_x11 ]; driverName = "fglrx"; };
cirrus = { modules = [ xorg.xf86videocirrus ]; }; cirrus = { modules = [ xorg.xf86videocirrus ]; };
i810 = { modules = [ xorg.xf86videoi810 ]; }; i810 = { modules = [ xorg.xf86videoi810 ]; };
intel = { modules = [ xorg.xf86videointel ]; }; intel = { modules = [ xorg.xf86videointel ]; };
@ -362,7 +363,8 @@ in
boot.extraModulePackages = boot.extraModulePackages =
optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++ optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++
optional (elem "nvidiaLegacy" driverNames) kernelPackages.nvidia_x11_legacy ++ optional (elem "nvidiaLegacy" driverNames) kernelPackages.nvidia_x11_legacy ++
optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions; optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++
optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
environment.etc = optionals cfg.exportConfiguration environment.etc = optionals cfg.exportConfiguration
[ { source = "${configFile}"; [ { source = "${configFile}";
@ -388,7 +390,8 @@ in
] ]
++ optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++ optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11
++ optional (elem "nvidiaLegacy" driverNames) kernelPackages.nvidia_x11_legacy ++ optional (elem "nvidiaLegacy" driverNames) kernelPackages.nvidia_x11_legacy
++ optional (elem "virtualbox" driverNames) xorg.xrefresh; ++ optional (elem "virtualbox" driverNames) xorg.xrefresh
++ optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
environment.systemPackages = config.environment.x11Packages; environment.systemPackages = config.environment.x11Packages;
@ -408,6 +411,9 @@ in
LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib"; LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib";
} // optionalAttrs (elem "nvidiaLegacy" driverNames) { } // optionalAttrs (elem "nvidiaLegacy" driverNames) {
LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy}/lib"; LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy}/lib";
} // optionalAttrs (elem "ati_unfree" driverNames) {
LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.ati_drivers_x11}/lib:${kernelPackages.ati_drivers_x11}/X11R6/lib64/modules/linux";
XORG_DRI_DRIVER_PATH = "${kernelPackages.ati_drivers_x11}/lib/dri"; # is ignored because ati drivers ship their own unpatched libglx.so !
} // cfg.displayManager.job.environment; } // cfg.displayManager.job.environment;
preStart = preStart =