mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 23:52:55 +00:00
xvfb-run: add some runtime dependencies to wrapper, set FONTCONFIG_FILE
This commit is contained in:
parent
f676f9e487
commit
374886444f
@ -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
|
||||
'';
|
||||
}
|
||||
|
@ -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 { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user