[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65479] [PATCH core-updates 20/61] gnu: docbook2x: Set search-paths
From: |
Bruno Victal |
Subject: |
[bug#65479] [PATCH core-updates 20/61] gnu: docbook2x: Set search-paths for XML and SGML catalogs. |
Date: |
Wed, 23 Aug 2023 23:35:12 +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.40.1
- [bug#65479] [PATCH core-updates 21/61] gnu: xmlto: Rewrite with G-Expressions., (continued)
- [bug#65479] [PATCH core-updates 21/61] gnu: xmlto: Rewrite with G-Expressions., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 23/61] gnu: gtk-doc: Add libxslt native-search-paths to its own., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 25/61] gnu: secilc: Drop xmlto workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 35/61] gnu: metapixel: Drop docbook workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 46/61] gnu: libnotify: Drop docbook workarounds., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 49/61] gnu: alsa-utils: Rewrite with G-Expressions., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 29/61] gnu: udisks: Drop docbook workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 33/61] gnu: git-crypt: Remove docbook workarounds., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 32/61] gnu: gtk: Drop docbook workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 26/61] gnu: xdg-utils: Drop docbook workarounds., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 20/61] gnu: docbook2x: Set search-paths for XML and SGML catalogs.,
Bruno Victal <=
- [bug#65479] [PATCH core-updates 17/61] gnu: Add docbook-mathml-1.0., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 38/61] gnu: libxkbcommon: Faux propagate libxml2., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 03/61] gnu: docbook-xml-5.1: Fix URIs in catalog.xml., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 24/61] gnu: docbook2x: Drop docbook-xml workarounds., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 42/61] gnu: drumstick: Drop docbook workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 22/61] gnu: xmlto: Add libxslt native-search-paths to its own., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 30/61] gnu: colord-gtk: Build documentation., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 28/61] gnu: udisks: Rewrite using G-Expressions., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 27/61] gnu: xdg-user-dirs: Drop docbook workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 31/61] gnu: criu: Drop xmlto workaround., Bruno Victal, 2023/08/23