Merge pull request #45707 from jtojnar/drop-nm-gtk

Drop libnm-gtk

8 files changed, 9 insertions, 40 deletions

diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix
index 0b6a7e622a86..d516a2b5ee87 100644
--- a/pkgs/tools/networking/network-manager/applet.nix
+++ b/pkgs/tools/networking/network-manager/applet.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3
-, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl
+, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43
 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
 , libgudev, jansson, wrapGAppsHook, gobjectIntrospection
 , libappindicator-gtk3, withGnome ? false }:
@@ -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"}"
@@ -35,7 +31,7 @@ in stdenv.mkDerivation rec {
     libappindicator-gtk3
   ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr ]; # advanced certificate chooser
 
-  nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ];
+  nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ];
 
   postPatch = ''
     chmod +x meson_post_install.py # patchShebangs requires executable file
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
index 11b29081f9bb..16964e4db945 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
@@ -25,6 +25,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ intltool pkgconfig ];
 
   configureFlags = [
+    "--without-libnm-glib"
     "--with-gnome=${if withGnome then "yes" else "no"}"
     "--localstatedir=/tmp"
   ];
diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix
index a3dbeaf82651..a6fd3e7303df 100644
--- a/pkgs/tools/networking/network-manager/iodine/default.nix
+++ b/pkgs/tools/networking/network-manager/iodine/default.nix
@@ -28,6 +28,7 @@ in stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
 
   configureFlags = [
+    "--without-libnm-glib"
     "--with-gnome=${if withGnome then "yes" else "no"}"
     "--localstatedir=/" # needed for the management socket under /run/NetworkManager
   ];
diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix
index d48d2e910f50..3cac1b5e63cf 100644
--- a/pkgs/tools/networking/network-manager/l2tp/default.nix
+++ b/pkgs/tools/networking/network-manager/l2tp/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
+    "--without-libnm-glib"
     "--with-gnome=${if withGnome then "yes" else "no"}"
     "--localstatedir=/var"
     "--sysconfdir=$(out)/etc"
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,
diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix
index 8d3bd874718c..0d3a4174744f 100644
--- a/pkgs/tools/networking/network-manager/openvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/openvpn/default.nix
@@ -25,6 +25,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ intltool pkgconfig libxml2 ];
 
   configureFlags = [
+    "--without-libnm-glib"
     "--with-gnome=${if withGnome then "yes" else "no"}"
     "--localstatedir=/" # needed for the management socket under /run/NetworkManager
   ];
diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
index fc10fc6364c9..d7f558574065 100644
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
 
   configureFlags = [
+    "--without-libnm-glib"
     "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm"
     "--with-nm-libexecdir=$(out)/libexec"
     "--with-nm-plugindir=$(out)/lib/NetworkManager"
diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix
index d2b3a345d495..ef45defb7d5a 100644
--- a/pkgs/tools/networking/network-manager/vpnc/default.nix
+++ b/pkgs/tools/networking/network-manager/vpnc/default.nix
@@ -24,6 +24,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ intltool pkgconfig file ];
 
   configureFlags = [
+    "--without-libnm-glib"
     "--with-gnome=${if withGnome then "yes" else "no"}"
   ];