diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-11 13:15:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 13:15:51 -0400 |
| commit | a6ce6c10525f38aadd2c3a8376c2b1a3c16668ec (patch) | |
| tree | 7e5f0a0143eb63296c6a30025889274298c069b2 /nixos/modules/services/x11/xserver.nix | |
| parent | 1036dc664169b32613ec11b58cc1740c7511a340 (diff) | |
| parent | 370d3af0c40c30f1dad763c35a2db637f70e6176 (diff) | |
| download | nixpkgs-a6ce6c10525f38aadd2c3a8376c2b1a3c16668ec.tar nixpkgs-a6ce6c10525f38aadd2c3a8376c2b1a3c16668ec.tar.gz nixpkgs-a6ce6c10525f38aadd2c3a8376c2b1a3c16668ec.tar.bz2 nixpkgs-a6ce6c10525f38aadd2c3a8376c2b1a3c16668ec.tar.lz nixpkgs-a6ce6c10525f38aadd2c3a8376c2b1a3c16668ec.tar.xz nixpkgs-a6ce6c10525f38aadd2c3a8376c2b1a3c16668ec.tar.zst nixpkgs-a6ce6c10525f38aadd2c3a8376c2b1a3c16668ec.zip | |
Merge pull request #61981 from ambrop72/no-opengl-ld-library-path
nixos: Don't set LD_LIBRARY_PATH for graphics drivers that don't need it.
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index a1ed2fd1e97..82730c5e80c 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -662,10 +662,9 @@ in restartIfChanged = false; environment = - { - LD_LIBRARY_PATH = concatStringsSep ":" ([ "/run/opengl-driver/lib" ] - ++ concatLists (catAttrs "libPath" cfg.drivers)); - } // cfg.displayManager.job.environment; + optionalAttrs config.hardware.opengl.setLdLibraryPath + { LD_LIBRARY_PATH = pkgs.addOpenGLRunpath.driverLink; } + // cfg.displayManager.job.environment; preStart = '' |