diff options
| author | Bruno Victal <mirai@makinata.eu> | 2023-10-09 21:05:50 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:42:07 +0200 |
| commit | e96fa0b695689d781e36018218703ee1c6fa086b (patch) | |
| tree | 783a226a4356e60d2bf58b7d5f6175a0fec2cd8e /gnu/packages/xml.scm | |
| parent | 994fbc0ac6c6efcb385cbd6ef7b9073b7571ac93 (diff) | |
| download | guix-e96fa0b695689d781e36018218703ee1c6fa086b.tar.gz guix-e96fa0b695689d781e36018218703ee1c6fa086b.zip | |
search-paths: Add $XML_CATALOG_FILES and $SGML_CATALOG_FILES.
These variables are used by some packages for XML/SGML catalog lookups.
* guix/search-paths ($XML_CATALOG_FILES, $SGML_CATALOG_FILES): New variable,
extracted from …
* gnu/packages/xml.scm (libxml2, opensp)[native-search-paths]: … here. Refer
to the variables from (guix search-paths) respectively.
* gnu/packages/perl.scm
(perl-app-xml-docbook-builder)[native-search-paths]: Use $XML_CATALOG_FILES.
* doc/guix.texi (Search Paths): Update documentation to reflect changes.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Diffstat (limited to 'gnu/packages/xml.scm')
| -rw-r--r-- | gnu/packages/xml.scm | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 8995b07328..dc7cde8c59 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -85,6 +85,7 @@ #:use-module (guix build-system python) #:use-module (guix deprecation) #:use-module (guix utils) + #:use-module (guix search-paths) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config)) @@ -227,14 +228,7 @@ hierarchical form with variable field lengths.") (inputs (list xz)) (propagated-inputs (list zlib)) ; libxml2.la says '-lz'. (native-inputs (list perl)) - ;; $XML_CATALOG_FILES lists 'catalog.xml' files found in under the 'xml' - ;; sub-directory of any given package. - (native-search-paths (list (search-path-specification - (variable "XML_CATALOG_FILES") - (separator " ") - (files '("xml")) - (file-pattern "^catalog\\.xml$") - (file-type 'regular)))) + (native-search-paths (list $XML_CATALOG_FILES)) (search-paths native-search-paths) (description "Libxml2 is the XML C parser and toolkit developed for the Gnome @@ -1808,14 +1802,7 @@ modular implementation of XML-RPC for C and C++.") (("^\tOSGMLNORM=`echo osgmlnorm\\|sed '\\$\\(transform\\)'`\\\\") "\tOSGMLNORM=`echo osgmlnorm|sed '$(transform)'`") (("^\t\\$\\(SHELL\\)\n") ""))))))) - ;; $SGML_CATALOG_FILES lists 'catalog' or 'CATALOG' or '*.cat' files found - ;; under the 'sgml' sub-directory of any given package. - (native-search-paths (list (search-path-specification - (variable "SGML_CATALOG_FILES") - (separator ":") - (files '("sgml")) - (file-pattern "^catalog$|^CATALOG$|^.*\\.cat$") - (file-type 'regular)))) + (native-search-paths (list $SGML_CATALOG_FILES)) (home-page "https://openjade.sourceforge.net/") (synopsis "Suite of SGML/XML processing tools") (description "OpenSP is an object-oriented toolkit for SGML parsing and |