From a13d1c3363c52a5a1d6a468884d5ece5a04ed3a5 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Thu, 16 May 2013 23:52:17 +0200
Subject: mesa WIP: fix bad symlinking, thanks to jack_c on IRC

---
 modules/services/x11/xserver.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 6f5e51043e9b..5738a24e69d9 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -478,8 +478,9 @@ in
 
         preStart =
           ''
-            rm -f /run/opengl-driver
-            ln -sf opengl-driver /run/opengl-driver-32
+            rm -f /run/opengl-driver{,-32}
+            ${optionalString (!cfg.driSupport32Bit) "ln -sf opengl-driver /run/opengl-driver-32"}
+
             ${# !!! The OpenGL driver depends on what's detected at runtime.
               if elem "nvidia" driverNames then
                 ''
-- 
cgit 1.4.1