diff options
| author | Alexander Ried <ried@mytum.de> | 2016-10-03 14:28:56 +0200 |
|---|---|---|
| committer | Alexander Ried <ried@mytum.de> | 2016-10-03 15:03:02 +0200 |
| commit | e7ded267bd39f8509c7c4ab2927c6aec9d567540 (patch) | |
| tree | 7b5182443ade183f2b8bc4b6259e007c515e0cfa /nixos/modules/services/x11/xserver.nix | |
| parent | 98e2b90cf382e3323f7f5d7b9dcc808099e53685 (diff) | |
| download | nixlib-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar nixlib-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.gz nixlib-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.bz2 nixlib-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.lz nixlib-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.xz nixlib-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.zst nixlib-e7ded267bd39f8509c7c4ab2927c6aec9d567540.zip | |
xserver: replace XKB_BINDIR with compile time option
--- Using the configure option relieves us of the patch and passing the path via the env var in many places. Also the env var may not be inherited when components like gdm spawn new sessions.
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 1bd578424ee4..7fbbf7a7c554 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -504,7 +504,6 @@ in environment = { - XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. 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" ] |