public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xvfb-run: fix missing tools

Browse Source 
- it was failing to find awk and mktemp
- use `makeBinPath` for better robustness wrt. multiple outputs
This commit is contained in:
Vladimír Čunát 2016-04-27 12:28:53 +02:00
parent 40838ad20f
commit 99b91020d6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/misc/xvfb-run/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config, xauth, utillinux, which, fontsConf}: { stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config
, xauth, utillinux, which, fontsConf, gawk, coreutils }:
let let
xvfb_run = fetchurl { xvfb_run = fetchurl {
url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server; url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server;
@ -17,6 +18,6 @@ stdenv.mkDerivation {
wrapProgram $out/bin/xvfb-run \ wrapProgram $out/bin/xvfb-run \
--set XKB_BINDIR "${xkbcomp}/bin" \ --set XKB_BINDIR "${xkbcomp}/bin" \
--set FONTCONFIG_FILE "${fontsConf}" \ --set FONTCONFIG_FILE "${fontsConf}" \
--prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux gawk coreutils ]}
''; '';
} }