gnu: libnma: Update inputs.

* gnu/packages/gnome.scm (libnam)[arguments]: Remove 'glib-or-gtk?' and
add phase 'patch-docbook-xml'.
[native-inputs]: Add 'docboock-xml-4.3' and 'vala'.
[inputs]: Remove 'adwaita'icon-theme'.

squash! gnu: libnma: Update inputs and licenses.
This commit is contained in:
Brice Waegeneire 2020-05-11 16:30:55 +02:00
parent 8b554a4e5a
commit c25ca6b79e
No known key found for this signature in database
GPG key ID: A94903A166A18FAE

View file

@ -820,16 +820,26 @@ (define-public libnma
"09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja")))) "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t)) `(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook-xml
(lambda* (#:key inputs #:allow-other-keys)
(let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook")))
(substitute* "libnma-docs.xml"
(("http://.*/docbookx\\.dtd")
(string-append xmldoc "/docbookx.dtd")))
#t))))))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("docbook-xml" ,docbook-xml-4.3)
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ("glib:bin" ,glib "bin")
("gtk-doc" ,gtk-doc) ("gtk-doc" ,gtk-doc)
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)
("vala" ,vala)))
(inputs (inputs
`(("adwaita-icon-theme" ,adwaita-icon-theme) `(("gcr" ,gcr)
("gcr" ,gcr)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("iso-codes" ,iso-codes) ("iso-codes" ,iso-codes)
("mobile-broadband-provider-info" ,mobile-broadband-provider-info) ("mobile-broadband-provider-info" ,mobile-broadband-provider-info)
@ -839,7 +849,6 @@ (define-public libnma
initially part of network-manager-applet and has now become a separate initially part of network-manager-applet and has now become a separate
project.") project.")
(home-page "https://gitlab.gnome.org/GNOME/libnma") (home-page "https://gitlab.gnome.org/GNOME/libnma")
;; Some files carry the "GPL-2.0+" SPDX identifier while others say ;; Some files carry the "GPL-2.0+" SPDX identifier while others say
;; "LGPL-2.1+". ;; "LGPL-2.1+".
(license license:gpl2+))) (license license:gpl2+)))