diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-10-03 17:12:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-03 17:12:59 +0200 |
commit | 69bb34673e9ce4522f6f5f561fb780a7e46b7a7c (patch) | |
tree | 5f0686a072ea55c66c3ca39fc5099e4a2eb7cf58 /nixos/modules/services/x11/xserver.nix | |
parent | a9cd913b7330e64ab0bdfe46b76de187e00623a8 (diff) | |
parent | e7ded267bd39f8509c7c4ab2927c6aec9d567540 (diff) | |
download | nixlib-69bb34673e9ce4522f6f5f561fb780a7e46b7a7c.tar nixlib-69bb34673e9ce4522f6f5f561fb780a7e46b7a7c.tar.gz nixlib-69bb34673e9ce4522f6f5f561fb780a7e46b7a7c.tar.bz2 nixlib-69bb34673e9ce4522f6f5f561fb780a7e46b7a7c.tar.lz nixlib-69bb34673e9ce4522f6f5f561fb780a7e46b7a7c.tar.xz nixlib-69bb34673e9ce4522f6f5f561fb780a7e46b7a7c.tar.zst nixlib-69bb34673e9ce4522f6f5f561fb780a7e46b7a7c.zip |
Merge pull request #19196 from groxxda/xkbbindir
xserver: replace XKB_BINDIR with compile time option
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 5f10f9b48a8c..ec2f3a4f8bb1 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -520,7 +520,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" ] |