diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-20 11:53:30 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-28 14:56:48 +0200 |
| commit | 908c2cf56c13400a8069641cf4d4a056dd58545e (patch) | |
| tree | 349adb63c0f4010092a01de62aaa2d4d712a1f24 /pkgs/tools | |
| parent | 7db611f2af869bac6e31ba814a5593c52d54ec19 (diff) | |
| download | nixlib-908c2cf56c13400a8069641cf4d4a056dd58545e.tar nixlib-908c2cf56c13400a8069641cf4d4a056dd58545e.tar.gz nixlib-908c2cf56c13400a8069641cf4d4a056dd58545e.tar.bz2 nixlib-908c2cf56c13400a8069641cf4d4a056dd58545e.tar.lz nixlib-908c2cf56c13400a8069641cf4d4a056dd58545e.tar.xz nixlib-908c2cf56c13400a8069641cf4d4a056dd58545e.tar.zst nixlib-908c2cf56c13400a8069641cf4d4a056dd58545e.zip | |
networkmanagerapplet: do not build libnm-gtk
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/network-manager/applet.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch | 33 |
2 files changed, 1 insertions, 38 deletions
diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index 0b6a7e622a86..e97aa5ad274b 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -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"}" diff --git a/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch b/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch deleted file mode 100644 index d7eef5749dba..000000000000 --- a/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch +++ /dev/null @@ -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, |