diff options
author | Rob Vermaas <rob.vermaas@gmail.com> | 2012-08-07 03:27:00 +0200 |
---|---|---|
committer | Rob Vermaas <rob.vermaas@gmail.com> | 2012-08-07 03:27:00 +0200 |
commit | 374886444f4463672c3b7474c9048810c319e8d0 (patch) | |
tree | c5ee13ac6cf4a07b5f1f2c55b8303a3aff71b863 /pkgs | |
parent | f676f9e4872ed8683a841517644f871047a351e9 (diff) |
xvfb-run: add some runtime dependencies to wrapper, set FONTCONFIG_FILE
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/misc/xvfb-run/default.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 3 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 ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 197d0e48dfdad..7054595180f23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1738,7 +1738,7 @@ let xtreemfs = callPackage ../tools/filesystems/xtreemfs {}; - xvfb_run = callPackage ../tools/misc/xvfb-run {}; + xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; youtubeDL = callPackage ../tools/misc/youtube-dl { }; |