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

   1 diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
   2 index 148acade5c..6395fbfbe5 100644
   3 --- a/data/84-nm-drivers.rules
   4 +++ b/data/84-nm-drivers.rules
   5 @@ -7,6 +7,6 @@ ACTION!="add|change|move", GOTO="nm_drivers_end"
   6  # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
   7  ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
   8  DRIVERS=="?*", GOTO="nm_drivers_end"
   9 -PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
  10 +PROGRAM="@runtimeShell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
  11
  12  LABEL="nm_drivers_end"
  13 diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
  14 index f3441508ab..7cde8d7d39 100644
  15 --- a/src/core/devices/nm-device.c
  16 +++ b/src/core/devices/nm-device.c
  17 @@ -14839,14 +14839,14 @@ nm_device_start_ip_check(NMDevice *self)
  18              gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET);
  19              if (gw) {
  20                  nm_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf);
  21 -                ping_binary = nm_utils_find_helper("ping", "/usr/bin/ping", NULL);
  22 +                ping_binary = "@iputils@/bin/ping";
  23                  log_domain  = LOGD_IP4;
  24              }
  25          } else if (priv->ip_data_6.state == NM_DEVICE_IP_STATE_READY) {
  26              gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET6);
  27              if (gw) {
  28                  nm_inet6_ntop(&NMP_OBJECT_CAST_IP6_ROUTE(gw)->gateway, buf);
  29 -                ping_binary = nm_utils_find_helper("ping6", "/usr/bin/ping6", NULL);
  30 +                ping_binary = "@iputils@/bin/ping";
  31                  log_domain  = LOGD_IP6;
  32              }
  33          }
  34 diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
  35 index 3dd2338a82..de75cc040b 100644
  36 --- a/src/libnm-client-impl/meson.build
  37 +++ b/src/libnm-client-impl/meson.build
  38 @@ -190,7 +190,6 @@ if enable_introspection
  39        input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources,
  40        output: 'nm-property-infos-' + name + '.xml',
  41        command: [
  42 -        python_path,
  43          gen_infos_cmd,
  44          name,
  45          '@OUTPUT@',
  46 @@ -206,7 +205,6 @@ if enable_introspection
  47          'env',
  48          'GI_TYPELIB_PATH=' + gi_typelib_path,
  49          'LD_LIBRARY_PATH=' + ld_library_path,
  50 -        python_path,
  51          gen_gir_cmd,
  52          '--lib-path', meson.current_build_dir(),
  53          '--gir', libnm_gir[0],
  54 diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c
  55 index cbe76f5f1c..8515f94994 100644
  56 --- a/src/libnmc-base/nm-vpn-helpers.c
  57 +++ b/src/libnmc-base/nm-vpn-helpers.c
  58 @@ -284,15 +284,6 @@ nm_vpn_openconnect_authenticate_helper(NMSettingVpn *s_vpn, GPtrArray *secrets,
  59      const char *const   *iter;
  60      const char          *path;
  61      const char          *opt;
  62 -    const char *const    DEFAULT_PATHS[] = {
  63 -        "/sbin/",
  64 -        "/usr/sbin/",
  65 -        "/usr/local/sbin/",
  66 -        "/bin/",
  67 -        "/usr/bin/",
  68 -        "/usr/local/bin/",
  69 -        NULL,
  70 -    };
  71      const char *oc_argv[(12 + 2 * G_N_ELEMENTS(oc_property_args))];
  72      const char *gw;
  73      int         port;
  74 @@ -311,15 +302,7 @@ nm_vpn_openconnect_authenticate_helper(NMSettingVpn *s_vpn, GPtrArray *secrets,
  75
  76      port = extract_url_port(gw);
  77
  78 -    path = nm_utils_file_search_in_paths("openconnect",
  79 -                                         "/usr/sbin/openconnect",
  80 -                                         DEFAULT_PATHS,
  81 -                                         G_FILE_TEST_IS_EXECUTABLE,
  82 -                                         NULL,
  83 -                                         NULL,
  84 -                                         error);
  85 -    if (!path)
  86 -        return FALSE;
  87 +    path = "@openconnect@/bin/openconnect";
  88
  89      oc_argv[oc_argc++] = path;
  90      oc_argv[oc_argc++] = "--authenticate";
  91 diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
  92 index 4d5079dfb3..5a15447fde 100644
  93 --- a/src/libnmc-setting/meson.build
  94 +++ b/src/libnmc-setting/meson.build
  95 @@ -9,7 +9,6 @@ if enable_docs
  96      input: [merge_cmd, nm_settings_docs_xml_gir['nmcli'], nm_property_infos_xml['nmcli']],
  97      output: 'settings-docs-input.xml',
  98      command: [
  99 -      python_path,
 100        merge_cmd,
 101        '@OUTPUT@',
 102        nm_property_infos_xml['nmcli'],
 103 @@ -23,7 +22,6 @@ if enable_docs
 104      input: [gen_cmd, settings_docs_input_xml],
 105      output: 'settings-docs.h',
 106      command: [
 107 -      python_path,
 108        gen_cmd,
 109        '--output', '@OUTPUT@',
 110        '--xml', settings_docs_input_xml
 111 diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build
 112 index 5686a1c174..cfb6649a21 100644
 113 --- a/src/tests/client/meson.build
 114 +++ b/src/tests/client/meson.build
 115 @@ -6,7 +6,6 @@ test(
 116    args: [
 117      build_root,
 118      source_root,
 119 -    python_path,
 120      '--',
 121      'TestNmcli',
 122    ],
 123 @@ -23,7 +22,6 @@ if enable_nm_cloud_setup
 124      args: [
 125        build_root,
 126        source_root,
 127 -      python_path,
 128        '--',
 129        'TestNmCloudSetup',
 130      ],