[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/122: gnu: glib-with-documentation: Fix documentation build.
From: |
guix-commits |
Subject: |
06/122: gnu: glib-with-documentation: Fix documentation build. |
Date: |
Fri, 11 Jun 2021 12:11:49 -0400 (EDT) |
raghavgururajan pushed a commit to branch wip-gnome
in repository guix.
commit 974c08d799827c0811471f8a062d38319fb2b69c
Author: Raghav Gururajan <rg@raghavgururajan.name>
AuthorDate: Thu Mar 11 09:39:52 2021 -0500
gnu: glib-with-documentation: Fix documentation build.
* gnu/packages/glib.scm (glib-with-documentation) [native-inputs]:
Add docbook-4.2. Remove libxml2.
[arguments]<#:phases>['patch-docbook-xml]: New phase.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
---
gnu/packages/glib.scm | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 0d9a93b..5576da0 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -320,7 +320,8 @@ functions for strings and common data structures.")
(properties (alist-delete 'hidden? (package-properties glib)))
(outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc reference
(native-inputs
- `(("docbook-xml" ,docbook-xml)
+ `(("docbook-xml-4.2" ,docbook-xml-4.2)
+ ("docbook-xml-4.5" ,docbook-xml)
("gtk-doc" ,gtk-doc) ; for the doc
("libxml2" ,libxml2)
,@(package-native-inputs glib)))
@@ -330,6 +331,17 @@ functions for strings and common data structures.")
`(cons "-Dgtk_doc=true" ,flags))
((#:phases phases)
`(modify-phases ,phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "docs"
+ (substitute* (find-files "." "\\.xml$")
+ (("http://www.oasis-open.org/docbook/xml/4\\.5/")
+ (string-append (assoc-ref inputs "docbook-xml-4.5")
+ "/xml/dtd/docbook/"))
+ (("http://www.oasis-open.org/docbook/xml/4\\.2/")
+ (string-append (assoc-ref inputs "docbook-xml-4.2")
+ "/xml/dtd/docbook/"))))
+ #t))
(add-after 'install 'move-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- 29/122: gnu: pango: Re-arrange inputs in alphabetical order., (continued)
- 29/122: gnu: pango: Re-arrange inputs in alphabetical order., guix-commits, 2021/06/11
- 36/122: gnu: gdk-pixbuf: Correct inputs., guix-commits, 2021/06/11
- 46/122: gnu: vala: Update to 0.52.0., guix-commits, 2021/06/11
- 44/122: gnu: vala: Enable coverage support., guix-commits, 2021/06/11
- 45/122: gnu: vala: Fix documentation., guix-commits, 2021/06/11
- 52/122: gnu: libgsf: Correct inputs., guix-commits, 2021/06/11
- 55/122: gnu: atk: Re-arrange inputs in alphabetical order., guix-commits, 2021/06/11
- 07/122: gnu: Temporarily use glib without documentation., guix-commits, 2021/06/11
- 10/122: gnu: glibmm: Update to 2.68.0., guix-commits, 2021/06/11
- 05/122: gnu: glib-with-documentation: Make some cosmetic changes., guix-commits, 2021/06/11
- 06/122: gnu: glib-with-documentation: Fix documentation build.,
guix-commits <=
- 17/122: gnu: gtk-doc: Enable help., guix-commits, 2021/06/11
- 19/122: gnu: gobject-introspection: Propagate glib., guix-commits, 2021/06/11
- 18/122: gnu: gtk-doc: Update synopsis, description, home-page and license., guix-commits, 2021/06/11
- 21/122: gnu: cairo: Change build-system., guix-commits, 2021/06/11
- 41/122: gnu: gdk-pixbuf: Disable failing tests., guix-commits, 2021/06/11
- 38/122: gnu: gdk-pixbuf: Fix documentation., guix-commits, 2021/06/11
- 35/122: gnu: gdk-pixbuf: Add missing arguments., guix-commits, 2021/06/11
- 32/122: gnu: pangomm: Update to 2.48.0., guix-commits, 2021/06/11
- 34/122: gnu: pangomm-2.42: Update to 2.42.2., guix-commits, 2021/06/11
- 42/122: gnu: gdk-pixbuf+svg: Correct package definition to include changes from gdk-pixbuf., guix-commits, 2021/06/11