diff options
author | Aristid Breitkreuz <aristidb@gmail.com> | 2013-02-19 18:28:25 +0100 |
---|---|---|
committer | Aristid Breitkreuz <aristidb@gmail.com> | 2013-02-19 18:28:25 +0100 |
commit | 37be1c89822c5a96ee8d308979ce7ec45ba8b9a0 (patch) | |
tree | 91304a761b04ae645b628d19458e1130c2d7f251 /modules/services/x11/xserver.nix | |
parent | b83be79adf1f0534a864e26de3c3a8b1486d9c3d (diff) | |
download | nixlib-37be1c89822c5a96ee8d308979ce7ec45ba8b9a0.tar nixlib-37be1c89822c5a96ee8d308979ce7ec45ba8b9a0.tar.gz nixlib-37be1c89822c5a96ee8d308979ce7ec45ba8b9a0.tar.bz2 nixlib-37be1c89822c5a96ee8d308979ce7ec45ba8b9a0.tar.lz nixlib-37be1c89822c5a96ee8d308979ce7ec45ba8b9a0.tar.xz nixlib-37be1c89822c5a96ee8d308979ce7ec45ba8b9a0.tar.zst nixlib-37be1c89822c5a96ee8d308979ce7ec45ba8b9a0.zip |
x11/mesa: driSupport32Bit for the mesa implementation
Diffstat (limited to 'modules/services/x11/xserver.nix')
-rw-r--r-- | modules/services/x11/xserver.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index 7cc507feb1d5..c4d74201c961 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -225,7 +225,8 @@ in description = '' On 64-bit systems, whether to support Direct Rendering for 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>. ''; }; @@ -497,9 +498,12 @@ in "ln -sf ${kernelPackages.nvidia_x11_legacy304} /run/opengl-driver" else if elem "ati_unfree" driverNames then "ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver" - else if cfg.driSupport then - "ln -sf ${pkgs.mesa} /run/opengl-driver" - else "" + 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} |