about summary refs log tree commit diff
path: root/pkgs/tools/misc/xvfb-run
diff options
context:
space:
mode:
authorRob Vermaas <rob.vermaas@gmail.com>2012-08-07 03:27:00 +0200
committerRob Vermaas <rob.vermaas@gmail.com>2012-08-07 03:27:00 +0200
commit374886444f4463672c3b7474c9048810c319e8d0 (patch)
treec5ee13ac6cf4a07b5f1f2c55b8303a3aff71b863 /pkgs/tools/misc/xvfb-run
parentf676f9e4872ed8683a841517644f871047a351e9 (diff)
xvfb-run: add some runtime dependencies to wrapper, set FONTCONFIG_FILE
Diffstat (limited to 'pkgs/tools/misc/xvfb-run')
-rw-r--r--pkgs/tools/misc/xvfb-run/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix
index 234317b5163a8..162fb73b3f00e 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config}:
+{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config, xauth, utillinux, which, fontsConf}:
 let
   xvfb_run = fetchurl {
     url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server;
@@ -16,6 +16,7 @@ stdenv.mkDerivation {
     chmod a+x $out/bin/xvfb-run
     wrapProgram $out/bin/xvfb-run \
       --set XKB_BINDIR "${xkbcomp}/bin" \
-      --prefix PATH : ${getopt}/bin:${xorgserver}/bin
+      --set FONTCONFIG_FILE "${fontsConf}" \
+      --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin
   '';
 }