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

asciidoc: add enableJava option

Browse Source 
fixes https://github.com/NixOS/nixpkgs/issues/37045
This commit is contained in:
Robert Schütz 2018-03-19 17:16:24 +01:00
parent cc4677c36e
commit 9ede31bfbe
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,9 @@
# backends # backends
, enableDeckjsBackend ? false , enableDeckjsBackend ? false
, enableOdfBackend ? false , enableOdfBackend ? false
# java is problematic on some platforms, where it is unfree
, enableJava ? true
}: }:
assert enableStandardFeatures -> assert enableStandardFeatures ->
@ -55,7 +58,7 @@ assert enableStandardFeatures ->
docbook_xml_dtd_45 != null && docbook_xml_dtd_45 != null &&
docbook5_xsl != null && docbook5_xsl != null &&
docbook_xsl != null && docbook_xsl != null &&
fop != null && (fop != null || !enableJava) &&
# TODO: Package this: # TODO: Package this:
# epubcheck != null && # epubcheck != null &&
gnused != null && gnused != null &&
@ -63,7 +66,7 @@ assert enableStandardFeatures ->
# filters # filters
assert enableExtraPlugins || enableDitaaFilter || enableMscgenFilter || enableDiagFilter || enableQrcodeFilter || enableAafigureFilter -> unzip != null; assert enableExtraPlugins || enableDitaaFilter || enableMscgenFilter || enableDiagFilter || enableQrcodeFilter || enableAafigureFilter -> unzip != null;
assert enableExtraPlugins || enableDitaaFilter -> jre != null; assert (enableExtraPlugins && enableJava) || enableDitaaFilter -> jre != null;
assert enableExtraPlugins || enableMscgenFilter -> mscgen != null; assert enableExtraPlugins || enableMscgenFilter -> mscgen != null;
assert enableExtraPlugins || enableDiagFilter -> blockdiag != null && seqdiag != null && actdiag != null && nwdiag != null; assert enableExtraPlugins || enableDiagFilter -> blockdiag != null && seqdiag != null && actdiag != null && nwdiag != null;
assert enableExtraPlugins || enableMatplotlibFilter -> matplotlib != null && numpy != null; assert enableExtraPlugins || enableMatplotlibFilter -> matplotlib != null && numpy != null;
@ -73,7 +76,7 @@ assert enableExtraPlugins || enableDeckjsBackend || enableOdfBackend -> unzip !=
let let
_enableDitaaFilter = enableExtraPlugins || enableDitaaFilter; _enableDitaaFilter = (enableExtraPlugins && enableJava) || enableDitaaFilter;
_enableMscgenFilter = enableExtraPlugins || enableMscgenFilter; _enableMscgenFilter = enableExtraPlugins || enableMscgenFilter;
_enableDiagFilter = enableExtraPlugins || enableDiagFilter; _enableDiagFilter = enableExtraPlugins || enableDiagFilter;
_enableQrcodeFilter = enableExtraPlugins || enableQrcodeFilter; _enableQrcodeFilter = enableExtraPlugins || enableQrcodeFilter;
@ -239,7 +242,7 @@ stdenv.mkDerivation rec {
-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'|" \
-e "s|^FOP =.*|FOP = '${fop}/bin/fop'|" \ ${optionalString enableJava ''-e "s|^FOP =.*|FOP = '${fop}/bin/fop'|"''} \
-e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \ -e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \
-e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \ -e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \
-e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \ -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \