diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 01:06:51 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 01:18:10 +0300 |
| commit | 74a3a2cd7e409062ad3efa61e84d366a8f67c853 (patch) | |
| tree | 3c12e08e51c0d1a2ec942ca02cb9cdbcc407b35d /pkgs/tools/typesetting | |
| parent | c2553952195cb390c9ae65e2a31ad02cc82d0f76 (diff) | |
| download | nixpkgs-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar nixpkgs-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.gz nixpkgs-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.bz2 nixpkgs-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.lz nixpkgs-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.xz nixpkgs-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.zst nixpkgs-74a3a2cd7e409062ad3efa61e84d366a8f67c853.zip | |
treewide: Use makeBinPath
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/djvu2pdf/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/docbook2odf/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/xmlto/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index a426356a09f..ce8a60dca86 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -p djvu2pdf $out/bin - wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre.bin}/bin:${which}/bin + wrapProgram $out/bin/djvu2pdf --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript djvulibre which ]} mkdir -p $out/man/man1 cp -p djvu2pdf.1.gz $out/man/man1 diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index 90b2ff61f34..029227cd118 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -i "s|/usr/share/docbook2odf|$out/share/docbook2odf|" "$out/bin/docbook2odf" wrapProgram "$out/bin/docbook2odf" \ - --prefix PATH : "${zip}/bin:${libxslt}/bin" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ zip libxslt ]}" \ --prefix PERL5PATH : "${stdenv.lib.makePerlPath [PerlMagick]}" ''; diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 2ed846cb070..ed3dad64f16 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xmlto" \ - --prefix PATH : "${libxslt.bin}/bin:${libxml2.bin}/bin:${getopt}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ libxslt libxml2 getopt ]}" # `w3m' is needed for HTML to text conversions. substituteInPlace "$out/share/xmlto/format/docbook/txt" \ |