diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-03-15 17:52:26 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-03-15 17:52:26 +0100 |
| commit | 4b7e5c1131430f10e6211879836cf17447ef5bbc (patch) | |
| tree | 54155070ec4044a78c1abf20f879fded47b5baf2 /gnu/packages/documentation.scm | |
| parent | adb984d23c003d5d48ada47bf5ad8105a3b8e412 (diff) | |
| parent | 608e42e7c92114497e7908980424288079acee1e (diff) | |
| download | patches-4b7e5c1131430f10e6211879836cf17447ef5bbc.tar patches-4b7e5c1131430f10e6211879836cf17447ef5bbc.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/documentation.scm')
| -rw-r--r-- | gnu/packages/documentation.scm | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index cd42bc0f35..792e70ecdd 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be> +;;; Copyright © 2017 Kei Kebreau <kei@openmailbox.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,6 +56,23 @@ `(#:tests? #f ; no 'check' target #:phases (modify-phases %standard-phases + ;; Some XML-related binaries are required for asciidoc's proper usage. + ;; Without these, asciidoc fails when parsing XML documents, either + ;; reporting a missing "xmllint" binary or, when passed the + ;; "--no-xmllint" option, a missing "xsltproc" binary. + ;; The following phase enables asciidoc to find some of them. + (add-before 'configure 'set-xml-binary-paths + (lambda* (#:key inputs #:allow-other-keys) + (let* ((libxml2 (assoc-ref inputs "libxml2")) + (xmllint (string-append libxml2 "/bin/xmllint")) + (libxslt (assoc-ref inputs "libxslt")) + (xsltproc (string-append libxslt "/bin/xsltproc"))) + (substitute* "a2x.py" + (("XMLLINT = 'xmllint'") + (string-append "XMLLINT = '" xmllint "'")) + (("XSLTPROC = 'xsltproc'") + (string-append "XSLTPROC = '" xsltproc "'"))) + #t))) ;; Make asciidoc use the local docbook-xsl package instead of fetching ;; it from the internet at run-time. (add-before 'install 'make-local-docbook-xsl @@ -69,7 +87,9 @@ release/xsl/current") ,(package-version docbook-xsl))))) #t))))) (inputs `(("python" ,python-2) - ("docbook-xsl" ,docbook-xsl))) + ("docbook-xsl" ,docbook-xsl) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt))) (home-page "http://www.methods.co.nz/asciidoc/") (synopsis "Text-based document generation system") (description |