summary refs log tree commit diff
path: root/pkgs/tools/typesetting/asciidoc
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-10-05 13:23:01 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-10-05 13:44:16 +0200
commit38313d5d877fc421d1381971051107e4b03dc40d (patch)
tree8143c1a0d11cd8d0cf10fe59a67508baa975ffba /pkgs/tools/typesetting/asciidoc
parentf8c211fd2b53d970a439d643bea9d0928fb08666 (diff)
downloadnixpkgs-38313d5d877fc421d1381971051107e4b03dc40d.tar
nixpkgs-38313d5d877fc421d1381971051107e4b03dc40d.tar.gz
nixpkgs-38313d5d877fc421d1381971051107e4b03dc40d.tar.bz2
nixpkgs-38313d5d877fc421d1381971051107e4b03dc40d.tar.lz
nixpkgs-38313d5d877fc421d1381971051107e4b03dc40d.tar.xz
nixpkgs-38313d5d877fc421d1381971051107e4b03dc40d.tar.zst
nixpkgs-38313d5d877fc421d1381971051107e4b03dc40d.zip
libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
Diffstat (limited to 'pkgs/tools/typesetting/asciidoc')
-rw-r--r--pkgs/tools/typesetting/asciidoc/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index b26582a6cc7..7c393c52415 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -237,12 +237,12 @@ stdenv.mkDerivation rec {
     # We can remove PATH= when those impurities are fixed.
     sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook5_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${tetex}/bin:${coreutils}/bin:${gnused}/bin')|" \
         -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
-        -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt}/bin/xsltproc'|" \
+        -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
         -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
         -e "s|^FOP =.*|FOP = '${fop}/bin/fop'|" \
         -e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \
         -e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \
-        -e "s|^XMLLINT =.*|XMLLINT = '${libxml2}/bin/xmllint'|" \
+        -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \
         -e "s|^EPUBCHECK =.*|EPUBCHECK = 'nixpkgs_is_missing_epubcheck'|" \
         -i a2x.py
   '' + ''