guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

gnu: Tinyproxy: Cleanup xml dependencies

Browse source 
* gnu/packages/web.scm (tinyproxy): Use the XML catalog from docbook instead of
  generating a temporary one.
This commit is contained in:
John Darrington 2014-07-13 16:37:52 +02:00
parent b4ce630048
commit 6217ca12c5
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gnu/packages/web.scm
View file

@ -528,25 +528,19 @@ help you implement simple HTTP servers.")
(alist-cons-before (alist-cons-before
'build 'pre-build 'build 'pre-build
(lambda* (#:key inputs #:allow-other-keys #:rest args) (lambda* (#:key inputs #:allow-other-keys #:rest args)
;; This stuff is needed, because without it, xmlint etc tries ;; Uncommenting the next two lines may assist in debugging
;; to download docbookx.dtd and docbook.xsl from the net ;; (substitute* "docs/man5/Makefile" (("a2x") "a2x -v"))
(let ((build (assoc-ref %standard-phases 'build)) ;; (setenv "XML_DEBUG_CATALOG" "1")
(docbook-xml (assoc-ref inputs "docbook-xml"))
(docbook-xsl (assoc-ref inputs "docbook-xsl")) (setenv "XML_CATALOG_FILES"
(our-catalog "/tmp/docbook-xml.xml")) (string-append
(setenv "XML_CATALOG_FILES" our-catalog) (assoc-ref inputs "docbook-xsl")
(with-output-to-file our-catalog "/xml/xsl/docbook-xsl-1.78.1/catalog.xml"
(lambda () ;; Contrary to the documentation, the file names must
(display (string-append ;; be separated by a space, not a colon.
"<?xml version=\"1.0\"?> " "
<!DOCTYPE catalog PUBLIC \"-//OASIS//DTD XML Catalogs V1.0//EN\" (assoc-ref inputs "docbook-xml")
\"file:///usr/share/xml/schema/xml-core/catalog.dtd\"> "/xml/dtd/docbook/catalog.xml")))
<catalog xmlns=\"urn:oasis:names:tc:entity:xmlns:xml:catalog\">
<system systemId=\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"
uri=\"file://" docbook-xml "/xml/dtd/docbook/docbookx.dtd\"/>
<system systemId=\"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\"
uri=\"file://" docbook-xsl "/xml/xsl/docbook-xsl-1.72.0/manpages/docbook.xsl\"/>
</catalog>\n"))))))
%standard-phases))) %standard-phases)))
;; All of the below are used to generate the documentation ;; All of the below are used to generate the documentation
;; (Should they be propagated inputs of asciidoc ??) ;; (Should they be propagated inputs of asciidoc ??)