diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-27 12:28:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-27 12:31:01 +0200 |
| commit | 99b91020d6fcbffa23c3322bbf060ab05bb5e190 (patch) | |
| tree | 5f5bc803ff608dad8f40f6fad4d97c4a97643b41 /pkgs/tools/misc/xvfb-run | |
| parent | 40838ad20f79ffcba430d97bd80fbb76e07f2474 (diff) | |
| download | nixpkgs-99b91020d6fcbffa23c3322bbf060ab05bb5e190.tar nixpkgs-99b91020d6fcbffa23c3322bbf060ab05bb5e190.tar.gz nixpkgs-99b91020d6fcbffa23c3322bbf060ab05bb5e190.tar.bz2 nixpkgs-99b91020d6fcbffa23c3322bbf060ab05bb5e190.tar.lz nixpkgs-99b91020d6fcbffa23c3322bbf060ab05bb5e190.tar.xz nixpkgs-99b91020d6fcbffa23c3322bbf060ab05bb5e190.tar.zst nixpkgs-99b91020d6fcbffa23c3322bbf060ab05bb5e190.zip | |
xvfb-run: fix missing tools
- it was failing to find awk and mktemp - use `makeBinPath` for better robustness wrt. multiple outputs
Diffstat (limited to 'pkgs/tools/misc/xvfb-run')
| -rw-r--r-- | pkgs/tools/misc/xvfb-run/default.nix | 5 |
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 f1cf0442434..b7f8e4b2106 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -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 xvfb_run = fetchurl { 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 \ --set XKB_BINDIR "${xkbcomp}/bin" \ --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 ]} ''; } |