summary refs log tree commit diff
path: root/nixos/modules/services/x11/xserver.nix
diff options
context:
space:
mode:
authorDavid McFarland <corngood@gmail.com>2021-12-16 17:33:13 -0400
committerDavid McFarland <corngood@gmail.com>2021-12-21 10:56:12 -0400
commit2f846e69c4f46b70cb40330fe7c949a071f6a92f (patch)
tree6634b9edef39d755f85cfe3b8321eacf06430e80 /nixos/modules/services/x11/xserver.nix
parenta7a0d58c6270be0078a6b6f763122a29544c1481 (diff)
downloadnixpkgs-2f846e69c4f46b70cb40330fe7c949a071f6a92f.tar
nixpkgs-2f846e69c4f46b70cb40330fe7c949a071f6a92f.tar.gz
nixpkgs-2f846e69c4f46b70cb40330fe7c949a071f6a92f.tar.bz2
nixpkgs-2f846e69c4f46b70cb40330fe7c949a071f6a92f.tar.lz
nixpkgs-2f846e69c4f46b70cb40330fe7c949a071f6a92f.tar.xz
nixpkgs-2f846e69c4f46b70cb40330fe7c949a071f6a92f.tar.zst
nixpkgs-2f846e69c4f46b70cb40330fe7c949a071f6a92f.zip
nixos/xserver: set correct LD_LIBRARY_PATH for opengl driver
This got broken by 370d3af0c40c30f1dad763c35a2db637f70e6176.  Previously
it was setting /run/opengl-driver/lib.  `driverLink` is missing the
/lib.
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
-rw-r--r--nixos/modules/services/x11/xserver.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 24d92573442..6b743f61d81 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -703,7 +703,7 @@ in
 
         environment =
           optionalAttrs config.hardware.opengl.setLdLibraryPath
-            { LD_LIBRARY_PATH = pkgs.addOpenGLRunpath.driverLink; }
+            { LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.addOpenGLRunpath.driverLink ]; }
           // cfg.displayManager.job.environment;
 
         preStart =