From 908c2cf56c13400a8069641cf4d4a056dd58545e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Aug 2018 11:53:30 +0200 Subject: [PATCH 1/8] networkmanagerapplet: do not build libnm-gtk --- .../networking/network-manager/applet.nix | 6 +--- .../network-manager/libnm-gtk-mbpi.patch | 33 ------------------- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch 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, From 8e46884331141b7f851b7fd5dd23967322339cc5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Aug 2018 11:57:29 +0200 Subject: [PATCH 2/8] networkmanagerapplet: add missing docbook DTDs --- pkgs/tools/networking/network-manager/applet.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index e97aa5ad274b..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 }: @@ -31,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 From a6130c36cd3a56da9198df974f119ca69a04c0f9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Aug 2018 14:59:16 +0200 Subject: [PATCH 3/8] networkmanager-iodine: remove nm-gtk dependency --- pkgs/tools/networking/network-manager/iodine/default.nix | 1 + 1 file changed, 1 insertion(+) 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 ]; From 2eb3fab10b6942dcffce7215a00eca4cfd139b14 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Aug 2018 15:00:27 +0200 Subject: [PATCH 4/8] networkmanager-fortisslvpn: remove nm-gtk dependency --- pkgs/tools/networking/network-manager/fortisslvpn/default.nix | 1 + 1 file changed, 1 insertion(+) 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" ]; From c858c831b6e8e724046752b922c0591a3f1d9e50 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Aug 2018 15:02:15 +0200 Subject: [PATCH 5/8] networkmanager-l2tp: remove nm-gtk dependency --- pkgs/tools/networking/network-manager/l2tp/default.nix | 1 + 1 file changed, 1 insertion(+) 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" From cb31e93abfc110a9e119214f8b804956f68551bf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Aug 2018 15:04:24 +0200 Subject: [PATCH 6/8] networkmanager-vpnc: remove nm-gtk dependency --- pkgs/tools/networking/network-manager/vpnc/default.nix | 1 + 1 file changed, 1 insertion(+) 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"}" ]; From 2683fe16a519e340989772f2b208971b911f3818 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Aug 2018 15:06:06 +0200 Subject: [PATCH 7/8] networkmanager-openvpn: remove nm-gtk dependency --- pkgs/tools/networking/network-manager/openvpn/default.nix | 1 + 1 file changed, 1 insertion(+) 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 ]; From 223543733081d787fc7c0ce34a59afac1363574f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Aug 2018 15:07:39 +0200 Subject: [PATCH 8/8] networkmanager_strongswan: remove nm-gtk dependency --- pkgs/tools/networking/network-manager/strongswan.nix | 1 + 1 file changed, 1 insertion(+) 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"