[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/122: gnu: glib-with-documentation: Make some cosmetic changes.
From: |
guix-commits |
Subject: |
05/122: gnu: glib-with-documentation: Make some cosmetic changes. |
Date: |
Fri, 11 Jun 2021 12:11:49 -0400 (EDT) |
raghavgururajan pushed a commit to branch wip-gnome
in repository guix.
commit 0740926a38602ddd5817ecb54103b69c374c9dba
Author: Raghav Gururajan <rg@raghavgururajan.name>
AuthorDate: Thu Mar 11 09:37:00 2021 -0500
gnu: glib-with-documentation: Make some cosmetic changes.
* gnu/packages/glib.scm (glib-with-documentation): Make some cosmetic
changes.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
---
gnu/packages/glib.scm | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index d761fe0..0d9a93b 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -320,8 +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
- `(("gtk-doc" ,gtk-doc) ; for the doc
- ("docbook-xml" ,docbook-xml)
+ `(("docbook-xml" ,docbook-xml)
+ ("gtk-doc" ,gtk-doc) ; for the doc
("libxml2" ,libxml2)
,@(package-native-inputs glib)))
(arguments
@@ -332,12 +332,13 @@ functions for strings and common data structures.")
`(modify-phases ,phases
(add-after 'install 'move-doc
(lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (doc (assoc-ref outputs "doc"))
- (html (string-append "/share/gtk-doc")))
- (copy-recursively (string-append out html)
- (string-append doc html))
- (delete-file-recursively (string-append out html))
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc"))
+ (html (string-append "/share/gtk-doc")))
+ (mkdir-p (string-append doc "/share"))
+ (rename-file
+ (string-append out html)
+ (string-append doc html))
#t)))))))))
;;; TODO: Merge into glib as a 'static' output on core-updates.
- 22/122: gnu: cairo: Move documentation to separate output., (continued)
- 22/122: gnu: cairo: Move documentation to separate output., guix-commits, 2021/06/11
- 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 <=
- 06/122: gnu: glib-with-documentation: Fix documentation build., guix-commits, 2021/06/11
- 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