From 4f0b59de9abde4d8b8c30dd364b08bb111391d3e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 18 Mar 2018 05:28:14 +0300 Subject: [PATCH] xserver service: cleanup LD_LIBRARY_PATH X libraries in LD_LIBRARY_PATH seem to not be needed anymore. I've tracked this addition as far as I could (02cef04c8187f12fd160d5fedf0ec8a928f02639) and they seem to be added for unfree NVIDIA and ATI drivers but at least for NVIDIA they are not needed anymore. We can add them with patchelf instead if it turns out to be the case with ATI. --- nixos/modules/services/x11/xserver.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index f96d3c5afba..a89d446187e 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -640,9 +640,7 @@ in environment = { - XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime. - LD_LIBRARY_PATH = concatStringsSep ":" ( - [ "${xorg.libX11.out}/lib" "${xorg.libXext.out}/lib" "/run/opengl-driver/lib" ] + LD_LIBRARY_PATH = concatStringsSep ":" ([ "/run/opengl-driver/lib" ] ++ concatLists (catAttrs "libPath" cfg.drivers)); } // cfg.displayManager.job.environment;