aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2018-12-05 21:17:59 +0100
committerKei Kebreau <kkebreau@posteo.net>2019-06-20 23:24:38 -0400
commitcd7f718ee0c51a6ad1f7d47d7d0d3ee0dcb74b90 (patch)
tree46508cb2a2f01a538e1680fe77704888cf96406c /gnu/packages
parent02710a9b558db8c5e56ab34a41ac6e30a1681a3f (diff)
downloadpatches-cd7f718ee0c51a6ad1f7d47d7d0d3ee0dcb74b90.tar
patches-cd7f718ee0c51a6ad1f7d47d7d0d3ee0dcb74b90.tar.gz
gnu: network-manager-applet: Use meson build system.
* gnu/packages/gnome.scm (network-manager-applet)[build-system]: Use meson-build-system. [arguments]: Set glib-or-gtk? flag. [native-inputs]: Add glib:bin and gtk-doc. [inputs]: Add gcr.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/gnome.scm27
1 files changed, 7 insertions, 20 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 725a256e8b..c584edc245 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5498,28 +5498,14 @@ to virtual private networks (VPNs) via OpenVPN.")
(sha256
(base32
"0y31g0lxr93370xi74hbpvcy9m81n5wdkdhq8xy2nqp0y4219p13"))))
- (build-system glib-or-gtk-build-system)
- (arguments '(#:configure-flags '("--disable-migration")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-source
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((mbpi (assoc-ref inputs
- "mobile-broadband-provider-info"))
- (iso-codes (assoc-ref inputs "iso-codes")))
- (substitute* "src/libnma/nma-mobile-providers.c"
- (("(g_build_filename \\()dirs\\[i\\].*,\
- (MOBILE_BROADBAND_PROVIDER_INFO.*)" all start end)
- (string-append start "\"" mbpi "/share\", " end)))
- (substitute* "src/libnma/nma-mobile-providers.c"
- (("(g_build_filename \\()dirs\\[i\\].*,\
- (ISO_3166_COUNTRY_CODES.*)" all start end)
- (string-append start "\"" iso-codes
- "/share\", " end)))
- #t))))))
+ (build-system meson-build-system)
+ (arguments
+ '(#:glib-or-gtk? #t))
(native-inputs
`(("intltool" ,intltool)
+ ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
("pkg-config" ,pkg-config)))
(propagated-inputs
;; libnm-gtk.pc refers to all these.
@@ -5527,7 +5513,8 @@ to virtual private networks (VPNs) via OpenVPN.")
("gtk+" ,gtk+)
("network-manager" ,network-manager)))
(inputs
- `(("iso-codes" ,iso-codes)
+ `(("gcr" ,gcr)
+ ("iso-codes" ,iso-codes)
("libgudev" ,libgudev)
("libnotify" ,libnotify)
("libsecret" ,libsecret)