raghavgururajan pushed a commit to branch wip-gnome
in repository guix.
commit 8f1d9d8f2df8561a2f0eb8f8306a05a7d5755f12
Author: Raghav Gururajan <[email protected]>
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 <[email protected]>
---
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 2a09f71..c8790c1 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.
