summary refs log tree commit diff
path: root/pkgs/tools/misc/xvfb-run
diff options
context:
space:
mode:
authorAlexander Ried <ried@mytum.de>2016-10-03 14:28:56 +0200
committerAlexander Ried <ried@mytum.de>2016-10-03 15:03:02 +0200
commite7ded267bd39f8509c7c4ab2927c6aec9d567540 (patch)
tree7b5182443ade183f2b8bc4b6259e007c515e0cfa /pkgs/tools/misc/xvfb-run
parent98e2b90cf382e3323f7f5d7b9dcc808099e53685 (diff)
downloadnixpkgs-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar
nixpkgs-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.gz
nixpkgs-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.bz2
nixpkgs-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.lz
nixpkgs-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.xz
nixpkgs-e7ded267bd39f8509c7c4ab2927c6aec9d567540.tar.zst
nixpkgs-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 'pkgs/tools/misc/xvfb-run')
-rw-r--r--pkgs/tools/misc/xvfb-run/default.nix1
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix
index 838831faaaf..c33f09529a5 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation {
 
     chmod a+x $out/bin/xvfb-run
     wrapProgram $out/bin/xvfb-run \
-      --set XKB_BINDIR "${xkbcomp}/bin" \
       --set FONTCONFIG_FILE "${fontsConf}" \
       --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux gawk coreutils ]}
   '';