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

Adding support for the nvidia legacy drivers (videoDriver = "nvidiaLegacy")

Browse Source 
svn path=/nixos/trunk/; revision=17285
This commit is contained in:
Lluís Batlle i Rossell 2009-09-19 22:09:29 +00:00
parent a574ae095a
commit 67fa5622bf
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ let
# Map the video driver setting to a driver. # Map the video driver setting to a driver.
knownVideoDrivers = { knownVideoDrivers = {
nvidia = { modules = [ kernelPackages.nvidia_x11 ]; }; nvidia = { modules = [ kernelPackages.nvidia_x11 ]; };
nvidiaLegacy = { modules = [ kernelPackages.nvidia_x11_legacy ]; };
vesa = { modules = [ xorg.xf86videovesa ]; }; vesa = { modules = [ xorg.xf86videovesa ]; };
vga = { modules = [ xorg.xf86videovga ]; }; vga = { modules = [ xorg.xf86videovga ]; };
sis = { modules = [ xorg.xf86videosis ]; }; sis = { modules = [ xorg.xf86videosis ]; };
@ -318,7 +319,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;
environment.etc = optionals cfg.exportConfiguration environment.etc = optionals cfg.exportConfiguration
[ { source = "${configFile}"; [ { source = "${configFile}";
@ -339,7 +341,8 @@ in
xorg.xsetroot xorg.xsetroot
xorg.xprop xorg.xprop
] ]
++ optional (videoDriver == "nvidia") kernelPackages.nvidia_x11; ++ optional (videoDriver == "nvidia") kernelPackages.nvidia_x11
++ optional (videoDriver == "nvidiaLegacy") kernelPackages.nvidia_x11_legacy;
environment.systemPackages = config.environment.x11Packages; environment.systemPackages = config.environment.x11Packages;
@ -357,6 +360,8 @@ in
XORG_DRI_DRIVER_PATH = "${pkgs.mesa}/lib/dri"; XORG_DRI_DRIVER_PATH = "${pkgs.mesa}/lib/dri";
} // optionalAttrs (videoDriver == "nvidia") { } // optionalAttrs (videoDriver == "nvidia") {
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 (videoDriver == "nvidiaLegacy") {
LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy}/lib";
} // cfg.displayManager.job.environment; } // cfg.displayManager.job.environment;
preStart = preStart =
@ -374,6 +379,10 @@ in
then '' then ''
ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
'' ''
else if videoDriver == "nvidia"
then ''
ln -sf ${kernelPackages.nvidia_x11_legacy} /var/run/opengl-driver
''
else if cfg.driSupport else if cfg.driSupport
then "ln -sf ${pkgs.mesa} /var/run/opengl-driver" then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
else "" else ""
@ -454,7 +463,7 @@ in
EndSection EndSection
Section "Extensions" Section "Extensions"
${optionalString (cfg.videoDriver == "nvidia" || cfg.videoDriver == "i810" || cfg.videoDriver == "ati" || cfg.videoDriver == "radeonhd") '' ${optionalString (cfg.videoDriver == "nvidia" || cfg.videoDriver == "nvidiaLegacy" || cfg.videoDriver == "i810" || cfg.videoDriver == "ati" || cfg.videoDriver == "radeonhd") ''
Option "Composite" "Enable" Option "Composite" "Enable"
''} ''}
EndSection EndSection
@ -472,7 +481,7 @@ in
services.xserver.deviceSection = services.xserver.deviceSection =
'' ''
Identifier "Device[0]" Identifier "Device[0]"
Driver "${cfg.videoDriver}" Driver "${if cfg.videoDriver == "nvidiaLegacy" then "nvidia" else cfg.videoDriver}"
# !!! Is the "Clone" option still useful? # !!! Is the "Clone" option still useful?
Option "Clone" "${if cfg.isClone then "on" else "off"}" Option "Clone" "${if cfg.isClone then "on" else "off"}"