diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 12:23:02 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 12:23:56 +0200 |
commit | f8c211fd2b53d970a439d643bea9d0928fb08666 (patch) | |
tree | 5084d953ed0e15e81e556c5db1399143c8069fc8 /pkgs/tools | |
parent | 32b31398eb562152a11d1be992c5ea6e110013f5 (diff) | |
download | nixpkgs-f8c211fd2b53d970a439d643bea9d0928fb08666.tar nixpkgs-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.gz nixpkgs-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.bz2 nixpkgs-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.lz nixpkgs-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.xz nixpkgs-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.zst nixpkgs-f8c211fd2b53d970a439d643bea9d0928fb08666.zip |
fontconfig: split into multiple outputs
Fixed all 'fontconfig}' references as well, hopefully, ugh!
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/graphics/gnuplot/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/system/plan9port/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/tools/system/plan9port/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/dblatex/default.nix | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index f8dd35576ff..08799d3e712 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ --prefix PATH : '${coreutils}/bin' \ - --prefix PATH : '${fontconfig}/bin' \ + --prefix PATH : '${fontconfig.bin}/bin' \ --run '. ${./set-gdfontpath-from-fontconfig.sh}' ''; diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 98b8ac7418b..15fcdcf6c9d 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -5,7 +5,7 @@ export PLAN9_TARGET=$PLAN9 configurePhase() { - echo CFLAGS=\"-I${fontconfig}/include -I${libXt_dev}/include\" > LOCAL.config + echo CFLAGS=\"-I${fontconfig_dev}/include -I${libXt_dev}/include\" > LOCAL.config echo X11=\"${libXt_dev}/include\" >> LOCAL.config for f in `grep -l -r /usr/local/plan9`; do diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 9833d81be1a..70f792953b8 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -48,5 +48,5 @@ stdenv.mkDerivation rec { }; libXt_dev = libXt.dev; - inherit fontconfig; + fontconfig_dev = fontconfig.dev; } diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 408ef8ae263..18f9c99ee24 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -37,16 +37,16 @@ stdenv.mkDerivation rec { sed -i 's|self.install_layout == "deb"|False|' setup.py '' + stdenv.lib.optionalString enableAllFeatures '' for file in $(find -name "*.py"); do - sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt}/bin/xsltproc|g' \ - -e 's|Popen(\["xsltproc|Popen(\["${libxslt}/bin/xsltproc|g' \ + sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt.bin}/bin/xsltproc|g' \ + -e 's|Popen(\["xsltproc|Popen(\["${libxslt.bin}/bin/xsltproc|g' \ -e 's|cmd = \["texindy|cmd = ["nixpkgs_is_missing_texindy|g' \ -e 's|cmd = "epstopdf|cmd = "${tex}/bin/epstopdf|g' \ -e 's|cmd = \["makeindex|cmd = ["${tex}/bin/makeindex|g' \ -e 's|doc.program = "pdflatex"|doc.program = "${tex}/bin/pdflatex"|g' \ -e 's|self.program = "latex"|self.program = "${tex}/bin/latex"|g' \ -e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \ - -e 's|"fc-match"|"${fontconfig}/bin/fc-match"|g' \ - -e 's|"fc-list"|"${fontconfig}/bin/fc-list"|g' \ + -e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|g' \ + -e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \ -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \ -e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \ -e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \ |