From e7ded267bd39f8509c7c4ab2927c6aec9d567540 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 3 Oct 2016 14:28:56 +0200 Subject: 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. --- pkgs/tools/misc/xvfb-run/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/tools/misc/xvfb-run') 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 ]} ''; -- cgit 1.4.1