[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#54235] [PATCH 1/3] gnu: docbook-xml-4.1.2: Install an XML catalog f
From: |
Maxim Cournoyer |
Subject: |
[bug#54235] [PATCH 1/3] gnu: docbook-xml-4.1.2: Install an XML catalog file. |
Date: |
Thu, 3 Mar 2022 09:05:56 -0500 |
* gnu/packages/docbook.scm (docbook-xml-4.1.2)[builder]: Generate a catalog
file.
[native-inputs]: Add libxml2.
---
gnu/packages/docbook.scm | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index cb1a0d4d5e..6b1c533609 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Andrew Whatson <whatson@gmail.com>
@@ -153,7 +153,8 @@ (define-public docbook-xml-4.2
"18hgwvmywh6a5jh38szjmg3hg2r4v5lb6r3ydc3rd8cp9wg61i5c"))))))
(define-public docbook-xml-4.1.2
- (package (inherit docbook-xml)
+ (package
+ (inherit docbook-xml)
(version "4.1.2")
(source (origin
(method url-fetch)
@@ -167,13 +168,22 @@ (define-public docbook-xml-4.1.2
#:builder
(begin
(use-modules (guix build utils))
- (let ((source (assoc-ref %build-inputs "source"))
- (unzip (string-append (assoc-ref %build-inputs "unzip")
- "/bin/unzip"))
- (dtd (string-append (assoc-ref %outputs "out")
- "/xml/dtd/docbook")))
+ (let* ((source (assoc-ref %build-inputs "source"))
+ (unzip (string-append (assoc-ref %build-inputs "unzip")
+ "/bin/unzip"))
+ (xmlcatalog (string-append (assoc-ref %build-inputs "libxml2")
+ "/bin/xmlcatalog"))
+ (dtd (string-append (assoc-ref %outputs "out")
+ "/xml/dtd/docbook"))
+ (catalog.xml (string-append dtd "/catalog.xml")))
(mkdir-p dtd)
- (invoke unzip source "-d" dtd)))))))
+ (invoke unzip source "-d" dtd)
+ ;; Create a minimal XML catalog, to use with libxml2 tools.
+ (invoke xmlcatalog "--noout" "--create" catalog.xml)
+ (invoke xmlcatalog "--noout" "--add" "public"
+ "-//OASIS//DTD DocBook XML V4.1.2//EN"
+ (string-append dtd "/docbookx.dtd") catalog.xml)))))
+ (native-inputs (list libxml2 unzip))))
(define-public docbook-xsl
(package
--
2.34.0
- [bug#54235] [PATCH 0/3] Add sysbench., Maxim Cournoyer, 2022/03/03
- [bug#54235] [PATCH 1/3] gnu: docbook-xml-4.1.2: Install an XML catalog file.,
Maxim Cournoyer <=
- [bug#54235] [PATCH 2/3] gnu: Add ck., Maxim Cournoyer, 2022/03/03
- [bug#54235] [PATCH 2/3] gnu: Add ck., Maxime Devos, 2022/03/03
- [bug#54235] [PATCH 2/3] gnu: Add ck., Maxim Cournoyer, 2022/03/07
- [bug#54235] [PATCH 2/3] gnu: Add ck., Maxime Devos, 2022/03/07
- [bug#54235] [PATCH 2/3] gnu: Add ck., Maxim Cournoyer, 2022/03/07
- [bug#54235] [PATCH 2/3] gnu: Add ck., Maxim Cournoyer, 2022/03/07
[bug#54235] [PATCH 3/3] gnu: Add sysbench., Maxim Cournoyer, 2022/03/03
[bug#54235] [PATCH v2 1/3] gnu: docbook-xml-4.1.2: Install an XML catalog file., Maxim Cournoyer, 2022/03/07