diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-09 18:55:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-09 18:55:59 +0200 |
| commit | c83e929b940972841e4dde16e3d16c953c8d3f27 (patch) | |
| tree | c9513b88740aec315dbfa3a42c0438233441e47e /pkgs/tools/networking/network-manager/openconnect | |
| parent | 368169366fa5d9a88870c5dc34c52d79a75735c7 (diff) | |
| parent | e4929b7c1a7827dfc64962e83704cc68f7ee6368 (diff) | |
| download | nixlib-c83e929b940972841e4dde16e3d16c953c8d3f27.tar nixlib-c83e929b940972841e4dde16e3d16c953c8d3f27.tar.gz nixlib-c83e929b940972841e4dde16e3d16c953c8d3f27.tar.bz2 nixlib-c83e929b940972841e4dde16e3d16c953c8d3f27.tar.lz nixlib-c83e929b940972841e4dde16e3d16c953c8d3f27.tar.xz nixlib-c83e929b940972841e4dde16e3d16c953c8d3f27.tar.zst nixlib-c83e929b940972841e4dde16e3d16c953c8d3f27.zip | |
Merge pull request #44689 from jtojnar/gnome-cleanup
GNOME2 cleanup
Diffstat (limited to 'pkgs/tools/networking/network-manager/openconnect')
| -rw-r--r-- | pkgs/tools/networking/network-manager/openconnect/default.nix | 43 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/openconnect/fix-paths.patch | 20 |
2 files changed, 63 insertions, 0 deletions
diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix new file mode 100644 index 000000000000..23d4c816a20d --- /dev/null +++ b/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, networkmanager, libsecret +, withGnome ? true, gnome3, kmod }: + +let + pname = "NetworkManager-openconnect"; + version = "1.2.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 = "15j98wwspv6mcmy91w30as5qc1bzsnhlk060xhjy4qrvd37y0xx1"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit kmod openconnect; + }) + ]; + + buildInputs = [ openconnect networkmanager ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret ]; + + nativeBuildInputs = [ intltool pkgconfig ]; + + configureFlags = [ + "--with-gnome=${if withGnome then "yes" else "no"}" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "networkmanager-openconnect"; + }; + }; + + meta = with stdenv.lib; { + description = "NetworkManager's OpenConnect plugin"; + inherit (networkmanager.meta) maintainers platforms; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch b/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch new file mode 100644 index 000000000000..9b342f5bd08b --- /dev/null +++ b/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch @@ -0,0 +1,20 @@ +--- a/src/nm-openconnect-service.c ++++ b/src/nm-openconnect-service.c +@@ -60,7 +60,7 @@ + + static const char *openconnect_binary_paths[] = + { +- "/usr/bin/openconnect", ++ "@openconnect@/bin/openconnect", + "/usr/sbin/openconnect", + "/usr/local/bin/openconnect", + "/usr/local/sbin/openconnect", +@@ -734,7 +734,7 @@ + + _LOGD ("nm-openconnect-service (version " DIST_VERSION ") starting..."); + +- if (system ("/sbin/modprobe tun") == -1) ++ if (system ("@kmod@/bin/modprobe tun") == -1) + exit (EXIT_FAILURE); + + if (bus_name) |