summary refs log tree commit diff
path: root/modules/services/x11/xserver.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-05-16 23:52:17 +0200
committerVladimír Čunát <vcunat@gmail.com>2013-05-16 23:52:17 +0200
commita13d1c3363c52a5a1d6a468884d5ece5a04ed3a5 (patch)
treef82026cbaf133fab97fbc459b35cf8a01adf6ac3 /modules/services/x11/xserver.nix
parenta649bbea4e2c07b5c10ecc34fc974f8fbe3cda26 (diff)
downloadnixlib-a13d1c3363c52a5a1d6a468884d5ece5a04ed3a5.tar
nixlib-a13d1c3363c52a5a1d6a468884d5ece5a04ed3a5.tar.gz
nixlib-a13d1c3363c52a5a1d6a468884d5ece5a04ed3a5.tar.bz2
nixlib-a13d1c3363c52a5a1d6a468884d5ece5a04ed3a5.tar.lz
nixlib-a13d1c3363c52a5a1d6a468884d5ece5a04ed3a5.tar.xz
nixlib-a13d1c3363c52a5a1d6a468884d5ece5a04ed3a5.tar.zst
nixlib-a13d1c3363c52a5a1d6a468884d5ece5a04ed3a5.zip
mesa WIP: fix bad symlinking, thanks to jack_c on IRC
Diffstat (limited to 'modules/services/x11/xserver.nix')
-rw-r--r--modules/services/x11/xserver.nix5
1 files changed, 3 insertions, 2 deletions
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
                 ''