summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Pelz <pelzflorian@pelzflorian.de>2019-05-15 23:41:44 +0200
committerLudovic Courtès <ludo@gnu.org>2019-05-16 13:30:32 +0200
commit3e9c80b27ae04e07e8a8cf2f2b1118b6dba926d4 (patch)
tree075bc2cfe2753ee293c087555c1a371c80c2cc52
parentce10e6053bb02e936b3a0862f3a3f86010b948d0 (diff)
gnu: network-manager-applet: Patch libnma for modem support.
* gnu/packages/gnome.scm (network-manager-applet): Patch libnma to load iso-codes and mobile-broadband-provider-info from the store and not require them in the profile. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--gnu/packages/gnome.scm23
1 files changed, 21 insertions, 2 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 09984717cca..9070673cf61 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -35,6 +35,7 @@
35;;; Copyright © 2018, 2019 Timothy Sample <samplet@ngyro.com> 35;;; Copyright © 2018, 2019 Timothy Sample <samplet@ngyro.com>
36;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org> 36;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
37;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> 37;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
38;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de>
38;;; 39;;;
39;;; This file is part of GNU Guix. 40;;; This file is part of GNU Guix.
40;;; 41;;;
@@ -5502,7 +5503,24 @@ to virtual private networks (VPNs) via OpenVPN.")
5502 (base32 5503 (base32
5503 "1js0i2kwfklahsn77qgxzdscy33drrlym3mrj1qhlw0zf8ri56ya")))) 5504 "1js0i2kwfklahsn77qgxzdscy33drrlym3mrj1qhlw0zf8ri56ya"))))
5504 (build-system glib-or-gtk-build-system) 5505 (build-system glib-or-gtk-build-system)
5505 (arguments '(#:configure-flags '("--disable-migration"))) 5506 (arguments '(#:configure-flags '("--disable-migration")
5507 #:phases
5508 (modify-phases %standard-phases
5509 (add-after 'unpack 'patch-source
5510 (lambda* (#:key inputs #:allow-other-keys)
5511 (let ((mbpi (assoc-ref inputs
5512 "mobile-broadband-provider-info"))
5513 (iso-codes (assoc-ref inputs "iso-codes")))
5514 (substitute* "src/libnma/nma-mobile-providers.c"
5515 (("(g_build_filename \\()dirs\\[i\\].*,\
5516 (MOBILE_BROADBAND_PROVIDER_INFO.*)" all start end)
5517 (string-append start "\"" mbpi "/share\", " end)))
5518 (substitute* "src/libnma/nma-mobile-providers.c"
5519 (("(g_build_filename \\()dirs\\[i\\].*,\
5520 (ISO_3166_COUNTRY_CODES.*)" all start end)
5521 (string-append start "\"" iso-codes
5522 "/share\", " end)))
5523 #t))))))
5506 (native-inputs 5524 (native-inputs
5507 `(("intltool" ,intltool) 5525 `(("intltool" ,intltool)
5508 ("gobject-introspection" ,gobject-introspection) 5526 ("gobject-introspection" ,gobject-introspection)
@@ -5519,7 +5537,8 @@ to virtual private networks (VPNs) via OpenVPN.")
5519 ("libsecret" ,libsecret) 5537 ("libsecret" ,libsecret)
5520 ("libselinux" ,libselinux) 5538 ("libselinux" ,libselinux)
5521 ("jansson" ,jansson) ; for team support 5539 ("jansson" ,jansson) ; for team support
5522 ("modem-manager" ,modem-manager))) 5540 ("modem-manager" ,modem-manager)
5541 ("mobile-broadband-provider-info" ,mobile-broadband-provider-info)))
5523 (synopsis "Applet for managing network connections") 5542 (synopsis "Applet for managing network connections")
5524 (home-page "https://www.gnome.org/projects/NetworkManager/") 5543 (home-page "https://www.gnome.org/projects/NetworkManager/")
5525 (description 5544 (description