diff mbox series

[bug#65479,core-updates,v3,15/63] gnu: docbook2x: Set search-paths for XML and SGML catalogs.

Message ID abaec4caa21c54fd08c35aed81f53dc3cb1e781a.1696881354.git.mirai@makinata.eu
State New
Headers show
Series Docbook & XML/SGML improvements | expand

Commit Message

Bruno Victal Oct. 9, 2023, 8:06 p.m. UTC 
According to the manpage, it has both XML and SGML catalog support through the
XML_CATALOG_FILES (resp. SGML_CATALOG_FILES) environment variables through
db2x_xsltproc.

* gnu/packages/docbook.scm (docbook2x)[arguments]<#:phases>: Don't hardcode
XML_CATALOG_FILES environmment variable.
[native-search-paths]: Add %libxslt-search-paths.
---
 gnu/packages/docbook.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index b092be42db..6da168dd52 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -43,6 +43,7 @@  (define-module (gnu packages docbook)
   #:use-module (gnu packages xfig)
   #:use-module (gnu packages xml)
   #:use-module (guix gexp)
+  #:use-module (guix search-paths)
   #:use-module (guix utils)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
@@ -911,14 +912,10 @@  (define-public docbook2x
                               '("perl-xml-namespacesupport"
                                 "perl-xml-parser"
                                 "perl-xml-sax"
-                                "perl-xml-sax-base")))
-                     (xml-catalog-files
-                      (list (search-input-file
-                             inputs "xml/dtd/docbook/catalog.xml"))))
+                                "perl-xml-sax-base"))))
                 (map (lambda (program)
                        (wrap-program program
-                         `("PERL5LIB" ":" prefix ,perl5lib)
-                         `("XML_CATALOG_FILES" " " prefix ,xml-catalog-files)))
+                         `("PERL5LIB" ":" prefix ,perl5lib)))
                      programs))))
           (add-after 'install 'sgml-check
             ;; This is not covered by 'make check'.
@@ -951,6 +948,7 @@  (define-public docbook2x
            ;; For tests
            docbook-xml-4.1.2 docbook-xml-4.2 docbook-xml-4.4
            groff-minimal libxml2))
+    (native-search-paths %libxslt-search-paths)
     (home-page "https://docbook2x.sourceforge.net")
     (synopsis "Convert DocBook to man page and Texinfo format")
     (description