diff mbox series

[bug#65479,core-updates,v2,20/62] gnu: docbook2x: Set search-paths for XML and SGML catalogs.

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

Commit Message

Bruno Victal Sept. 23, 2023, 2:19 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.

* gnu/packages/docbook.scm (docbook2x)[arguments]<#:phases>: Don't hardcode
XML_CATALOG_FILES environmment variable.
[native-search-paths]: Add $XML_CATALOG_FILES and $SGML_CATALOG_FILES.
---
 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 1b24c3522e..2f221866cc 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)
@@ -1048,14 +1049,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'.
@@ -1089,6 +1086,7 @@  (define-public docbook2x
            docbook-xml-4.1.2 docbook-xml-4.2 docbook-xml-4.4
            docbook-xml-4.5
            groff-minimal libxml2))
+    (native-search-paths (list $XML_CATALOG_FILES $SGML_CATALOG_FILES))
     (outputs '("out" "doc"))
     (home-page "https://docbook2x.sourceforge.net")
     (synopsis "Convert DocBook to man page and Texinfo format")