[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65479] [PATCH core-updates v2 20/62] gnu: docbook2x: Set search-pat
From: |
Bruno Victal |
Subject: |
[bug#65479] [PATCH core-updates v2 20/62] gnu: docbook2x: Set search-paths for XML and SGML catalogs. |
Date: |
Sat, 23 Sep 2023 15:19:55 +0100 |
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 --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")
--
2.41.0
- [bug#65479] [PATCH core-updates v2 00/62] Docbook & XML/SGML improvements., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 01/62] gnu: docbook-xml: Fix installation paths., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 22/62] gnu: xmlto: Add libxslt native-search-paths to its own., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 03/62] gnu: docbook-xml-5.1: Fix URIs in catalog.xml., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 10/62] gnu: docbook2x: Split documentation., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 19/62] gnu: lilypond: Use dblatex/stable., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 04/62] gnu: docbook-xsl: Add compatibility entry., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 20/62] gnu: docbook2x: Set search-paths for XML and SGML catalogs.,
Bruno Victal <=
- [bug#65479] [PATCH core-updates v2 13/62] gnu: libxml2: Add SGML_CATALOG_FILES to native-search-path., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 28/62] gnu: udisks: Rewrite using G-Expressions., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 23/62] gnu: gtk-doc: Add libxslt native-search-paths to its own., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 08/62] gnu: docbook2x: Import patches from debian., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 05/62] gnu: docbook-xsl: Add rewrite entries for http., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 31/62] gnu: criu: Drop xmlto workaround., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 06/62] gnu: docbook: Remove leftovers., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 18/62] gnu: dblatex: Fix missing texlive binaries., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 12/62] search-paths: Add $XML_CATALOG_FILES and $SGML_CATALOG_FILES., Bruno Victal, 2023/09/23