diff options
| author | Robert Schütz <rschuetz17@gmail.com> | 2019-03-07 22:27:12 +0100 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2019-03-07 22:27:12 +0100 |
| commit | 39495404a3eebbe8cb7f324901aa3608fcc21e54 (patch) | |
| tree | 98e57393d23fa534654ebd1303d4867ebde77ff5 /pkgs/tools/typesetting/asciidoc | |
| parent | fe043784a61cd3f2877433eea9d6e86bdf75b3fd (diff) | |
| download | nixpkgs-39495404a3eebbe8cb7f324901aa3608fcc21e54.tar nixpkgs-39495404a3eebbe8cb7f324901aa3608fcc21e54.tar.gz nixpkgs-39495404a3eebbe8cb7f324901aa3608fcc21e54.tar.bz2 nixpkgs-39495404a3eebbe8cb7f324901aa3608fcc21e54.tar.lz nixpkgs-39495404a3eebbe8cb7f324901aa3608fcc21e54.tar.xz nixpkgs-39495404a3eebbe8cb7f324901aa3608fcc21e54.tar.zst nixpkgs-39495404a3eebbe8cb7f324901aa3608fcc21e54.zip | |
asciidoc: replace tetex by texlive (#56782)
Diffstat (limited to 'pkgs/tools/typesetting/asciidoc')
| -rw-r--r-- | pkgs/tools/typesetting/asciidoc/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index efa1471f068..d18a5e2c744 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -5,7 +5,7 @@ , highlight ? null , pygments ? null , graphviz ? null -, tetex ? null +, texlive ? null , dblatexFull ? null , libxslt ? null , w3m ? null @@ -47,7 +47,7 @@ assert enableStandardFeatures -> highlight != null && pygments != null && graphviz != null && - tetex != null && + texlive != null && dblatexFull != null && libxslt != null && w3m != null && @@ -220,8 +220,8 @@ stdenv.mkDerivation rec { -e "s|fdp|${graphviz}/bin/fdp|g" \ -i "filters/graphviz/graphviz2png.py" - sed -e "s|run('latex|run('${tetex}/bin/latex|g" \ - -e "s|cmd = 'dvipng'|cmd = '${tetex}/bin/dvipng'|g" \ + sed -e "s|run('latex|run('${texlive}/bin/latex|g" \ + -e "s|cmd = 'dvipng'|cmd = '${texlive}/bin/dvipng'|g" \ -i "filters/latex/latex2png.py" sed -e "s|run('abc2ly|run('${lilypond}/bin/abc2ly|g" \ @@ -238,7 +238,8 @@ stdenv.mkDerivation rec { # use it to work around an impurity in the tetex package; tetex tools # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm). # 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 ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ tetex coreutils gnused ]}')|" \ + # TODO: Is this still necessary when using texlive? + sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ texlive coreutils gnused ]}')|" \ -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \ -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \ |