me/guix
Archived
1
0
Fork 0
Code Activity

gnu: glib-with-documentation: Remove patch-docbook-xml phase.

Browse source 
* gnu/packages/glib.scm (glib-with-documentation) [arguments]: Remove
patch-docbook-xml phase.
[native-inputs]: Use modify-inputs.  Remove labels.
This commit is contained in:
Maxim Cournoyer 2023-04-20 14:56:18 -04:00
parent 579e8fd003
commit 911aa1a5ad
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/glib.scm
View file

@ -9,7 +9,7 @@
;;; Copyright © 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2019, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2019, 2020, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
@ -443,13 +443,13 @@ functions for strings and common data structures.")
(properties (alist-delete 'hidden? (package-properties glib))) (properties (alist-delete 'hidden? (package-properties glib)))
(outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc reference (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc reference
(native-inputs (native-inputs
`(("docbook-xml-4.2" ,docbook-xml-4.2) (modify-inputs (package-native-inputs glib)
("docbook-xml-4.5" ,docbook-xml) (prepend docbook-xml-4.2
("docbook-xsl" ,docbook-xsl) docbook-xml
("gtk-doc" ,gtk-doc) docbook-xsl
("libxml2" ,libxml2) gtk-doc
("xsltproc" ,libxslt) libxml2
,@(package-native-inputs glib))) libxslt)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments glib) (substitute-keyword-arguments (package-arguments glib)
((#:configure-flags flags ''()) ((#:configure-flags flags ''())
@ -457,16 +457,6 @@ functions for strings and common data structures.")
(delete "-Dman=false" #$flags))) (delete "-Dman=false" #$flags)))
((#:phases phases) ((#:phases phases)
#~(modify-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/"))))))
(add-after 'install 'move-doc (add-after 'install 'move-doc
(lambda _ (lambda _
(let ((html "/share/gtk-doc")) (let ((html "/share/gtk-doc"))