Unverified Commit c6eb8431 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

networkmanager: drop hard dependency on openconnect 

Its closure size is huge, due to a dependency on webkitgtk, and now that
we want to enable networkmanager on the ISOs by default closure size
matters a lot.

Instead we now pass openconnect to the PATH of the systemd unit and pick
it up from there.
parent 6e1cd10a

pkgs/by-name/ne/networkmanager-openconnect/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ stdenv.mkDerivation rec { 
      versionPolicy = "odd-unstable";

    };

    networkManagerPlugin = "VPN/nm-openconnect-service.name";

    networkManagerRuntimeDeps = [ openconnect ];

  };



  meta = with lib; {

pkgs/tools/networking/networkmanager/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
  docbook_xml_dtd_412,

  docbook_xml_dtd_42,

  docbook_xml_dtd_43,

  openconnect,

  curl,

  meson,

  mesonEmulatorHook,
@@ -130,7 +129,6 @@ stdenv.mkDerivation (finalAttrs: { 
    (replaceVars ./fix-paths.patch {

      inherit

        iputils

        openconnect

        ethtool

        gnused

        ;

pkgs/tools/networking/networkmanager/fix-paths.patch

+8 −9
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ index 148acade5c..6395fbfbe5 100644 
 

 LABEL="nm_drivers_end"

diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c

index f3441508ab..7cde8d7d39 100644

index e310a9c680..ed8d838e43 100644

--- a/src/core/devices/nm-device.c

+++ b/src/core/devices/nm-device.c

@@ -14839,14 +14839,14 @@ nm_device_start_ip_check(NMDevice *self)

@@ -15239,14 +15239,14 @@ nm_device_start_ip_check(NMDevice *self)

             gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET);

             if (gw) {

                 nm_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf);
@@ -32,7 +32,7 @@ index f3441508ab..7cde8d7d39 100644 
             }

         }

diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c

index cbe76f5f1c..8515f94994 100644

index cbe76f5f1c..6ec684f9fe 100644

--- a/src/libnmc-base/nm-vpn-helpers.c

+++ b/src/libnmc-base/nm-vpn-helpers.c

@@ -284,15 +284,6 @@ nm_vpn_openconnect_authenticate_helper(NMSettingVpn *s_vpn, GPtrArray *secrets,
@@ -51,7 +51,7 @@ index cbe76f5f1c..8515f94994 100644 
     const char *oc_argv[(12 + 2 * G_N_ELEMENTS(oc_property_args))];

     const char *gw;

     int         port;

@@ -311,15 +302,7 @@ nm_vpn_openconnect_authenticate_helper(NMSettingVpn *s_vpn, GPtrArray *secrets,

@@ -311,13 +302,8 @@ nm_vpn_openconnect_authenticate_helper(NMSettingVpn *s_vpn, GPtrArray *secrets,

 

     port = extract_url_port(gw);
@@ -62,9 +62,8 @@ index cbe76f5f1c..8515f94994 100644 
-                                         NULL,

-                                         NULL,

-                                         error);

-    if (!path)

-        return FALSE;

+    path = "@openconnect@/bin/openconnect";

+    path = g_find_program_in_path("openconnect");

+

     if (!path)

         return FALSE;

 
     oc_argv[oc_argc++] = path;

     oc_argv[oc_argc++] = "--authenticate";