public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

asciidoc: replace tetex by texlive (#56782)

Browse Source
This commit is contained in:
Robert Schütz 2019-03-07 22:27:12 +01:00 committed by xeji
parent fe043784a6
commit 39495404a3
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/typesetting/asciidoc/default.nix
View File

@ -5,7 +5,7 @@
, highlight ? null , highlight ? null
, pygments ? null , pygments ? null
, graphviz ? null , graphviz ? null
, tetex ? null , texlive ? null
, dblatexFull ? null , dblatexFull ? null
, libxslt ? null , libxslt ? null
, w3m ? null , w3m ? null
@ -47,7 +47,7 @@ assert enableStandardFeatures ->
highlight != null && highlight != null &&
pygments != null && pygments != null &&
graphviz != null && graphviz != null &&
tetex != null && texlive != null &&
dblatexFull != null && dblatexFull != null &&
libxslt != null && libxslt != null &&
w3m != null && w3m != null &&
@ -220,8 +220,8 @@ stdenv.mkDerivation rec {
-e "s|fdp|${graphviz}/bin/fdp|g" \ -e "s|fdp|${graphviz}/bin/fdp|g" \
-i "filters/graphviz/graphviz2png.py" -i "filters/graphviz/graphviz2png.py"
sed -e "s|run('latex|run('${tetex}/bin/latex|g" \ sed -e "s|run('latex|run('${texlive}/bin/latex|g" \
-e "s|cmd = 'dvipng'|cmd = '${tetex}/bin/dvipng'|g" \ -e "s|cmd = 'dvipng'|cmd = '${texlive}/bin/dvipng'|g" \
-i "filters/latex/latex2png.py" -i "filters/latex/latex2png.py"
sed -e "s|run('abc2ly|run('${lilypond}/bin/abc2ly|g" \ 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 # use it to work around an impurity in the tetex package; tetex tools
# cannot find their neighbours (e.g. pdflatex doesn't find mktextfm). # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm).
# We can remove PATH= when those impurities are fixed. # 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|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
-e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
-e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \ -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \

2
pkgs/top-level/all-packages.nix
View File

@ -1745,11 +1745,13 @@ in
asciidoc-full = appendToName "full" (asciidoc.override { asciidoc-full = appendToName "full" (asciidoc.override {
inherit (python2Packages) pygments; inherit (python2Packages) pygments;
texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; };
enableStandardFeatures = true; enableStandardFeatures = true;
}); });
asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override { asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override {
inherit (python2Packages) pygments; inherit (python2Packages) pygments;
texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; };
enableStandardFeatures = true; enableStandardFeatures = true;
enableExtraPlugins = true; enableExtraPlugins = true;
}); });