ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 23:46:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: wayland: Drop patch-docbook-xml phase.

Browse source 
* gnu/packages/freedesktop.scm (wayland)
[arguments]: Use gexps.  Remove patch-docbook-xml phase.
[native-inputs]: Remove input labels.
This commit is contained in:
Maxim Cournoyer 2023-04-20 13:31:25 -04:00
parent 9a03afbe17
commit 5d49434c45
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 26 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
gnu/packages/freedesktop.scm
View file

@ -25,7 +25,7 @@
;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com> ;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me> ;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021, 2022, 2023 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2021, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de> ;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
@ -1176,47 +1176,32 @@ (define-public wayland
(build-system meson-build-system) (build-system meson-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
`(#:parallel-tests? #f (list #:parallel-tests? #f
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook-xml (add-after 'install 'move-doc
(lambda* (#:key native-inputs inputs #:allow-other-keys) (lambda _
(with-directory-excursion "doc" (mkdir-p (string-append #$output:doc "/share"))
(substitute* (find-files "." "\\.xml$") (rename-file
(("http://www.oasis-open.org/docbook/xml/4\\.5/") (string-append #$output "/share/doc")
(string-append (assoc-ref (or native-inputs inputs) (string-append #$output:doc "/share/doc")))))))
"docbook-xml")
"/xml/dtd/docbook/"))
(("http://www.oasis-open.org/docbook/xml/4\\.2/")
(string-append (assoc-ref (or native-inputs inputs)
"docbook-xml-4.2")
"/xml/dtd/docbook/"))))))
(add-after 'install 'move-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc")))
(mkdir-p (string-append doc "/share"))
(rename-file
(string-append out "/share/doc")
(string-append doc "/share/doc"))))))))
(native-inputs (native-inputs
`(("docbook-xml-4.2" ,docbook-xml-4.2) (append
("docbook-xml" ,docbook-xml) (list docbook-xml-4.2
("docbook-xsl" ,docbook-xsl) docbook-xml
("dot" ,graphviz) docbook-xsl
("doxygen" ,doxygen) graphviz
("pkg-config" ,pkg-config) doxygen
("python" ,python) pkg-config
("xmlto" ,xmlto) python
("xsltproc" ,libxslt) xmlto
,@(if (%current-target-system) libxslt)
`(("pkg-config-for-build" ,pkg-config-for-build) (if (%current-target-system)
("wayland" ,this-package)) ; for wayland-scanner (list pkg-config-for-build
'()))) this-package) ;for wayland-scanner
(inputs '())))
(list expat libxml2)) ; for XML_CATALOG_FILES (inputs (list expat libxml2)) ;for XML_CATALOG_FILES
(propagated-inputs (propagated-inputs (list libffi))
(list libffi))
(home-page "https://wayland.freedesktop.org/") (home-page "https://wayland.freedesktop.org/")
(synopsis "Core Wayland window system code and protocol") (synopsis "Core Wayland window system code and protocol")
(description "Wayland is a project to define a protocol for a compositor to (description "Wayland is a project to define a protocol for a compositor to