diff options
Diffstat (limited to 'pkgs/tools/networking/network-manager/openvpn')
-rw-r--r-- | pkgs/tools/networking/network-manager/openvpn/default.nix | 45 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager/openvpn/fix-paths.patch | 34 |
2 files changed, 79 insertions, 0 deletions
diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix new file mode 100644 index 000000000000..2eef7f31ab55 --- /dev/null +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, networkmanager, libsecret +, withGnome ? true, gnome3, procps, kmod }: + +let + pname = "NetworkManager-openvpn"; + version = "1.8.4"; +in stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit kmod openvpn; + }) + ]; + + buildInputs = [ openvpn networkmanager libsecret ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring + gnome3.networkmanagerapplet ]; + + nativeBuildInputs = [ intltool pkgconfig libxml2 ]; + + configureFlags = [ + "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}" + "--disable-static" + "--localstatedir=/" # needed for the management socket under /run/NetworkManager + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "networkmanager-openvpn"; + }; + }; + + meta = { + description = "NetworkManager's OpenVPN plugin"; + inherit (networkmanager.meta) maintainers platforms; + }; +} diff --git a/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch b/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch new file mode 100644 index 000000000000..b735da28dca1 --- /dev/null +++ b/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch @@ -0,0 +1,34 @@ +--- 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); |