public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

networkmanagerapplet: do not build libnm-gtk

This commit is contained in:
Jan Tojnar 2018-08-20 11:53:30 +02:00
parent 7db611f2af
commit 908c2cf56c
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/network-manager/applet.nix
View File

@ -15,12 +15,8 @@ in stdenv.mkDerivation rec {
sha256 = "0lmlkh4yyl9smvkgrzshn127zqfbp9f41f448ks8dlhhm38s38v2";
};
patches = [
# https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/19
./libnm-gtk-mbpi.patch
];
mesonFlags = [
"-Dlibnm_gtk=false" # It is deprecated
"-Dselinux=false"
"-Dappindicator=yes"
"-Dgcr=${if withGnome then "true" else "false"}"

33
pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch
View File

@ -1,33 +0,0 @@
--- a/meson.build
+++ b/meson.build
@@ -137,7 +137,7 @@
mobile_broadband_provider_info_dep = dependency('mobile-broadband-provider-info')
config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_dep.get_pkgconfig_variable('database'))
else
- config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_prefix, 'share', 'mobile-broadband-provider-info', 'serviceproviders.xml'))
+ config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_datadir, 'mobile-broadband-provider-info', 'serviceproviders.xml'))
endif
gio_dep = dependency('gio-2.0', version: '>= 2.38')
--- a/src/libnm-gtk/nm-mobile-providers.c
+++ b/src/libnm-gtk/nm-mobile-providers.c
@@ -30,10 +30,6 @@
#include "nm-mobile-providers.h"
-#ifndef MOBILE_BROADBAND_PROVIDER_INFO
-#define MOBILE_BROADBAND_PROVIDER_INFO DATADIR"/mobile-broadband-provider-info/serviceproviders.xml"
-#endif
-
#define ISO_3166_COUNTRY_CODES ISO_CODES_PREFIX"/share/xml/iso-codes/iso_3166.xml"
#define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX"/share/locale"
@@ -990,7 +986,7 @@
if (!country_codes)
country_codes = ISO_3166_COUNTRY_CODES;
if (!service_providers)
- service_providers = MOBILE_BROADBAND_PROVIDER_INFO;
+ service_providers = MOBILE_BROADBAND_PROVIDER_INFO_DATABASE;
countries = read_country_codes (country_codes,
cancellable,