From 8f1d9d8f2df8561a2f0eb8f8306a05a7d5755f12 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 09:37:00 -0500 Subject: gnu: glib-with-documentation: Make some cosmetic changes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/glib.scm (glib-with-documentation): Make some cosmetic changes. Signed-off-by: Léo Le Bouter --- 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 2a09f71b08..c8790c15d7 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. -- cgit 1.4.1