TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: libmodulemd: Fix build and use new style inputs and gexps.

Browse source 
* gnu/packages/rpm.scm (libmodulemd)
[arguments]: Use gexps.
[phases]{fix-glib-doc-prefix}: Use search-input-directory.
{fix-docbook-references}: Use search-input-file.
{move-documentation}: Use search-input-directory.
[native-inputs]: Use new style.  Add python.
[inputs]: Use new style.
This commit is contained in:
Maxim Cournoyer 2022-08-02 14:58:39 -04:00
parent b316ddbd83
commit 5ee30cfa84
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 39 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
gnu/packages/rpm.scm
View file

@ -86,52 +86,50 @@ (define-public libmodulemd
(build-system meson-build-system)
(outputs '("out" "doc")) ;2.6 MiB of HTML documentation
(arguments
`(#:configure-flags
(list (string-append "-Dgobject_overrides_dir_py3="
(python:site-packages %build-inputs %outputs)))
#:imported-modules (,@%meson-build-system-modules
(list
#:configure-flags
#~(list (string-append "-Dgobject_overrides_dir_py3="
(python:site-packages %build-inputs %outputs)))
#:imported-modules `(,@%meson-build-system-modules
(guix build python-build-system))
#:modules ((guix build meson-build-system)
#:modules '((guix build meson-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-glib-doc-prefix
(lambda* (#:key inputs #:allow-other-keys)
(let ((glib:doc (assoc-ref inputs "glib:doc")))
(substitute* "meson.build"
(("glib_docpath = .*")
(format #f "glib_docpath = '~a'~%"
(string-append glib:doc
"/share/gtk-doc/html")))))))
(add-after 'unpack 'fix-docbook-references
;; gtk-doc doesn't seem to honor DocBook 4.1.2's docbook.cat's
;; catalog file, even when adding it to XML_CATALOG_FILES. Work
;; around it by adjusting the DocBook references directly.
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "modulemd/modulemd-docs.xml"
(("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd")
(string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook/docbookx.dtd")))))
(add-after 'install 'move-documentation
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))
(src (string-append out "/share/gtk-doc"))
(dst (string-append doc "/share/gtk-doc")))
(mkdir-p (dirname dst))
(rename-file src dst)))))))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-glib-doc-prefix
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(substitute* "meson.build"
(("glib_docpath = .*")
(format #f "glib_docpath = '~a'~%"
(search-input-directory (or native-inputs inputs)
"share/gtk-doc/html"))))))
(add-after 'unpack 'fix-docbook-references
;; gtk-doc doesn't seem to honor DocBook 4.1.2's docbook.cat's
;; catalog file, even when adding it to XML_CATALOG_FILES. Work
;; around it by adjusting the DocBook references directly.
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "modulemd/modulemd-docs.xml"
(("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd")
(search-input-file inputs "xml/dtd/docbook/docbookx.dtd")))))
(add-after 'install 'move-documentation
(lambda* (#:key outputs #:allow-other-keys)
(let ((dst (string-append #$output:doc "/share/gtk-doc")))
(mkdir-p (dirname dst))
(rename-file (search-input-directory outputs "share/gtk-doc")
dst)))))))
(native-inputs
`(("docbook-xml" ,docbook-xml-4.1.2)
("glib:bin" ,glib "bin")
("glib:doc" ,glib-with-documentation "doc")
("gobject-introspection" ,gobject-introspection) ;for g-ir-scanner
("gtk-doc" ,gtk-doc)
("help2man" ,help2man)
("pkg-config" ,pkg-config)))
(list docbook-xml-4.1.2
`(,glib "bin")
`(,glib-with-documentation "doc")
gobject-introspection ;for g-ir-scanner
gtk-doc
help2man
pkg-config
python)) ;for 'site-packages' call
(inputs
`(("gtk" ,gtk+)
("python-pygobject" ,python-pygobject)))
(list gtk+
python-pygobject))
(propagated-inputs
;; glib and gobject are listed as 'Requires' in modulemd-2.0.pc.
(list glib