nixpkgs/pkgs/by-name/ne/networkmanager-openvpn/fix-paths.patch
aleksana 571c71e6f7 treewide: migrate packages to pkgs/by-name, take 1
We are migrating packages that meet below requirements:

1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration

The tool is here: https://github.com/Aleksanaa/by-name-migrate.
2024-11-09 20:04:51 +08:00

35 lines
914 B
Diff

--- a/properties/nm-openvpn-editor.c
+++ b/properties/nm-openvpn-editor.c
@@ -775,8 +775,7 @@
nm_find_openvpn (void)
{
static const char *openvpn_binary_paths[] = {
- "/usr/sbin/openvpn",
- "/sbin/openvpn",
+ "@openvpn@/bin/openvpn",
NULL
};
const char **openvpn_binary = openvpn_binary_paths;
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -522,9 +522,7 @@
openvpn_binary_find_exepath (void)
{
static const char *paths[] = {
- "/usr/sbin/openvpn",
- "/sbin/openvpn",
- "/usr/local/sbin/openvpn",
+ "@openvpn@/bin/openvpn",
};
int i;
@@ -2326,7 +2324,7 @@
_LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting...");
if ( !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS)
- && (system ("/sbin/modprobe tun") == -1))
+ && (system ("@kmod@/bin/modprobe tun") == -1))
return EXIT_FAILURE;
plugin = nm_openvpn_plugin_new (bus_name);