tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
2index ffae5f553..ba1093e4d 100644
3--- a/clients/common/nm-vpn-helpers.c
4+++ b/clients/common/nm-vpn-helpers.c
5@@ -203,10 +203,7 @@ nm_vpn_openconnect_authenticate_helper (const char *host,
6 NULL,
7 };
8
9- path = nm_utils_file_search_in_paths ("openconnect", "/usr/sbin/openconnect", DEFAULT_PATHS,
10- G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error);
11- if (!path)
12- return FALSE;
13+ path = "@openconnect@/bin/openconnect";
14
15 if (!g_spawn_sync (NULL,
16 (char **) NM_MAKE_STRV (path, "--authenticate", host),
17diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
18index e398cb9f2..a43d61864 100644
19--- a/data/84-nm-drivers.rules
20+++ b/data/84-nm-drivers.rules
21@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end"
22 # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
23 ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
24 DRIVERS=="?*", GOTO="nm_drivers_end"
25-PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
26+PROGRAM="@runtimeShell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
27
28 LABEL="nm_drivers_end"
29diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
30index 91ebd9a36..5201a56c3 100644
31--- a/data/NetworkManager.service.in
32+++ b/data/NetworkManager.service.in
33@@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@
34 [Service]
35 Type=dbus
36 BusName=org.freedesktop.NetworkManager
37-ExecReload=/usr/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
38+ExecReload=@systemd@/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
39 #ExecReload=/bin/kill -HUP $MAINPID
40 ExecStart=@sbindir@/NetworkManager --no-daemon
41 Restart=on-failure
42diff --git a/libnm/meson.build b/libnm/meson.build
43index 51ca46d2b..0c04cc216 100644
44--- a/libnm/meson.build
45+++ b/libnm/meson.build
46@@ -261,7 +261,7 @@ if enable_introspection
47 name,
48 input: libnm_gir[0],
49 output: name,
50- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
51+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
52 depends: libnm_gir,
53 )
54
55@@ -270,7 +270,7 @@ if enable_introspection
56 name,
57 input: [libnm_gir[0], nm_settings_docs_overrides],
58 output: name,
59- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
60+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
61 depends: libnm_gir,
62 )
63 endif
64diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
65index e7a4a059a..0a8f8b7c6 100644
66--- a/src/devices/nm-device.c
67+++ b/src/devices/nm-device.c
68@@ -13179,14 +13179,14 @@ nm_device_start_ip_check (NMDevice *self)
69 gw = nm_ip4_config_best_default_route_get (priv->ip_config_4);
70 if (gw) {
71 nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf);
72- ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL);
73+ ping_binary = "@iputils@/bin/ping";
74 log_domain = LOGD_IP4;
75 }
76 } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) {
77 gw = nm_ip6_config_best_default_route_get (priv->ip_config_6);
78 if (gw) {
79 nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf);
80- ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL);
81+ ping_binary = "@iputils@/bin/ping";
82 log_domain = LOGD_IP6;
83 }
84 }
85diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
86index fb92289f0..c91b27b09 100644
87--- a/src/nm-core-utils.c
88+++ b/src/nm-core-utils.c
89@@ -336,7 +336,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char *
90
91 /* construct the argument list */
92 argv = g_ptr_array_sized_new (4);
93- g_ptr_array_add (argv, "/sbin/modprobe");
94+ g_ptr_array_add (argv, "@kmod@/bin/modprobe");
95 g_ptr_array_add (argv, "--use-blacklist");
96 g_ptr_array_add (argv, (char *) arg1);
97