From 537a71a51e6b16d18ba0c8e87ae2ec60f902228e Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 10 Jul 2013 16:18:18 +0200
Subject: openconnect and vpnc NetworkManager plugins added

also openvpn plugin updated to the same version as NetworkManager
---
 .../networking/network-manager/openconnect.nix     | 46 ++++++++++++++++++++++
 pkgs/tools/networking/network-manager/openvpn.nix  |  2 +-
 pkgs/tools/networking/network-manager/pptp.nix     |  4 +-
 pkgs/tools/networking/network-manager/vpnc.nix     | 46 ++++++++++++++++++++++
 4 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/networking/network-manager/openconnect.nix
 create mode 100644 pkgs/tools/networking/network-manager/vpnc.nix

(limited to 'pkgs/tools/networking/network-manager')

diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix
new file mode 100644
index 000000000000..795f727599b0
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/openconnect.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager
+, withGnome ? true, gtk2, gconf, libgnome_keyring, procps, module_init_tools }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+  pname = "NetworkManager-openconnect";
+  version = networkmanager.version;
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
+    sha256 = "16sdgrabbh2y7j6g9ic9lm5z6sxn7iz3j0xininkiwnjgbsqf961";
+  };
+
+  buildInputs = [ openconnect networkmanager ]
+    ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring gconf ];
+
+  nativeBuildInputs = [ intltool pkgconfig ];
+
+  configureFlags = [
+    "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}"
+    "--disable-static"
+  ];
+
+  preConfigure = ''
+     substituteInPlace "configure" \
+       --replace "/sbin/sysctl" "${procps}/sbin/sysctl"
+     substituteInPlace "src/nm-openconnect-service.c" \
+       --replace "/sbin/openconnect" "${openconnect}/sbin/openconnect" \
+       --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe"
+  '';
+
+  postConfigure = ''
+     substituteInPlace "./auth-dialog/Makefile" \
+       --replace "-Wstrict-prototypes" "" \
+       --replace "-Werror" ""
+     substituteInPlace "properties/Makefile" \
+       --replace "-Wstrict-prototypes" "" \
+       --replace "-Werror" ""
+  '';
+
+  meta = {
+    description = "TODO";
+    inherit (networkmanager.meta) maintainers platforms;
+  };
+}
+
diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix
index 9817a8cddd12..d49dcbbc92a4 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn.nix
@@ -4,7 +4,7 @@
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-openvpn";
-  version = "0.9.8.0";
+  version = networkmanager.version;
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix
index a60199aab2d0..41dda0086e4b 100644
--- a/pkgs/tools/networking/network-manager/pptp.nix
+++ b/pkgs/tools/networking/network-manager/pptp.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-pptp";
-  version = "0.9.8.0";
+  version = networkmanager.version;
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
-    sha256 = "1j4wczf0lv2c58pgdfxg2qsva5v0r1w99x6l1p78m56qc8a9il1l";
+    sha256 = "7f46ea61376d13d03685eca3f26a26e0022f6e92e6f1fc356034ca9717eb6dac";
   };
 
   buildInputs = [ networkmanager pptp ppp ]
diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix
new file mode 100644
index 000000000000..57ab5af5bcb3
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/vpnc.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager
+, withGnome ? true, gtk2, libgnome_keyring, procps, module_init_tools }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+  pname = "NetworkManager-vpnc";
+  version = networkmanager.version;
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
+    sha256 = "1hdigqfvsjlr1zr23lwmcsvcv1x74cqhfpwrd0j0zhhmjdb4ql74";
+  };
+
+  buildInputs = [ vpnc networkmanager ]
+    ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring ];
+
+  nativeBuildInputs = [ intltool pkgconfig ];
+
+  configureFlags = [
+    "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}"
+    "--disable-static"
+  ];
+
+  preConfigure = ''
+     substituteInPlace "configure" \
+       --replace "/sbin/sysctl" "${procps}/sbin/sysctl"
+     substituteInPlace "src/nm-vpnc-service.c" \
+       --replace "/sbin/vpnc" "${vpnc}/sbin/vpnc" \
+       --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe"
+  '';
+
+  postConfigure = ''
+     substituteInPlace "./auth-dialog/Makefile" \
+       --replace "-Wstrict-prototypes" "" \
+       --replace "-Werror" ""
+     substituteInPlace "properties/Makefile" \
+       --replace "-Wstrict-prototypes" "" \
+       --replace "-Werror" ""
+  '';
+
+  meta = {
+    description = "TODO";
+    inherit (networkmanager.meta) maintainers platforms;
+  };
+}
+
-- 
cgit 1.4.1