pyrox.dev
networkmanagerapplet: do not build libnm-gtk
+1
-5
pkgs/tools/networking/network-manager/applet.nix
+1
-5
pkgs/tools/networking/network-manager/applet.nix
···
15
15
sha256 = "0lmlkh4yyl9smvkgrzshn127zqfbp9f41f448ks8dlhhm38s38v2";
16
16
};
17
17
18
-
patches = [
19
-
# https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/19
20
-
./libnm-gtk-mbpi.patch
21
-
];
22
-
23
18
mesonFlags = [
19
+
"-Dlibnm_gtk=false" # It is deprecated
24
20
"-Dselinux=false"
25
21
"-Dappindicator=yes"
26
22
"-Dgcr=${if withGnome then "true" else "false"}"
-33
pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch
-33
pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch
···
1
-
--- a/meson.build
2
-
+++ b/meson.build
3
-
@@ -137,7 +137,7 @@
4
-
mobile_broadband_provider_info_dep = dependency('mobile-broadband-provider-info')
5
-
config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_dep.get_pkgconfig_variable('database'))
6
-
else
7
-
- config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_prefix, 'share', 'mobile-broadband-provider-info', 'serviceproviders.xml'))
8
-
+ config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_datadir, 'mobile-broadband-provider-info', 'serviceproviders.xml'))
9
-
endif
10
-
11
-
gio_dep = dependency('gio-2.0', version: '>= 2.38')
12
-
--- a/src/libnm-gtk/nm-mobile-providers.c
13
-
+++ b/src/libnm-gtk/nm-mobile-providers.c
14
-
@@ -30,10 +30,6 @@
15
-
16
-
#include "nm-mobile-providers.h"
17
-
18
-
-#ifndef MOBILE_BROADBAND_PROVIDER_INFO
19
-
-#define MOBILE_BROADBAND_PROVIDER_INFO DATADIR"/mobile-broadband-provider-info/serviceproviders.xml"
20
-
-#endif
21
-
-
22
-
#define ISO_3166_COUNTRY_CODES ISO_CODES_PREFIX"/share/xml/iso-codes/iso_3166.xml"
23
-
#define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX"/share/locale"
24
-
25
-
@@ -990,7 +986,7 @@
26
-
if (!country_codes)
27
-
country_codes = ISO_3166_COUNTRY_CODES;
28
-
if (!service_providers)
29
-
- service_providers = MOBILE_BROADBAND_PROVIDER_INFO;
30
-
+ service_providers = MOBILE_BROADBAND_PROVIDER_INFO_DATABASE;
31
-
32
-
countries = read_country_codes (country_codes,
33
-
cancellable,