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

Merge pull request #93 from aristidb/master

Browse Source 
Implementation: services.xserver.driSupport32Bits: Intel support via mesa (#92)
This commit is contained in:
viric 2013-02-20 11:52:22 -08:00
commit f43729298d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,7 +225,8 @@ in
description = '' description = ''
On 64-bit systems, whether to support Direct Rendering for On 64-bit systems, whether to support Direct Rendering for
32-bit applications (such as Wine). This is currently only 32-bit applications (such as Wine). This is currently only
supported for the <literal>nvidia</literal> driver. supported for the <literal>nvidia</literal> driver and for
<literal>mesa</literal>.
''; '';
}; };
@ -501,9 +502,12 @@ in
'' ''
else if elem "ati_unfree" driverNames then else if elem "ati_unfree" driverNames then
"ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver" "ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"
else if cfg.driSupport then else
"ln -sf ${pkgs.mesa} /run/opengl-driver" ''
else "" ${optionalString cfg.driSupport "ln -sf ${pkgs.mesa} /run/opengl-driver"}
${optionalString (pkgs.stdenv.system == "x86_64-linux" && cfg.driSupport32Bit)
"ln -sf ${pkgs_i686.mesa} /run/opengl-driver-32"}
''
} }
${cfg.displayManager.job.preStart} ${cfg.displayManager.job.preStart}