From 531e4b80c97002a542beb8fe356177ebd66cdd8e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 5 Sep 2017 17:26:13 -0400 Subject: misc pkgs: Basic sed to get fix `pkgconfig` and `autoreconfHook` `buildInputs` Only acts on one-line dependency lists. --- pkgs/tools/typesetting/tex/texlive/bin.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/typesetting') diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index c15f165013b98..95ee3ab3b7138 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -209,7 +209,8 @@ dvisvgm = stdenv.mkDerivation { inherit (common) src; - buildInputs = [ pkgconfig core/*kpathsea*/ ghostscript zlib freetype potrace ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ core/*kpathsea*/ ghostscript zlib freetype potrace ]; preConfigure = "cd texk/dvisvgm"; @@ -225,7 +226,8 @@ dvipng = stdenv.mkDerivation { inherit (common) src; - buildInputs = [ pkgconfig core/*kpathsea*/ zlib libpng freetype gd ghostscript makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ core/*kpathsea*/ zlib libpng freetype gd ghostscript makeWrapper ]; preConfigure = "cd texk/dvipng"; @@ -247,7 +249,8 @@ bibtex8 = stdenv.mkDerivation { inherit (common) src; - buildInputs = [ pkgconfig core/*kpathsea*/ icu ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ core/*kpathsea*/ icu ]; preConfigure = "cd texk/bibtex-x"; @@ -263,7 +266,8 @@ xdvi = stdenv.mkDerivation { inherit (common) src; - buildInputs = [ pkgconfig core/*kpathsea*/ freetype ghostscript ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ core/*kpathsea*/ freetype ghostscript ] ++ (with xorg; [ libX11 libXaw libXi libXpm libXmu libXaw libXext libXfixes ]); preConfigure = "cd texk/xdvik"; -- cgit 1.4.1