From 537a71a51e6b16d18ba0c8e87ae2ec60f902228e Mon Sep 17 00:00:00 2001 From: Rok Garbas 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-applet/default.nix | 17 ++++++-- .../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 ++++++++++++++++++++++ 5 files changed, 109 insertions(+), 6 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') diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 387ccfcaed43..69c7b77e3f90 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf , libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, networkmanager_openvpn, udev, hicolor_icon_theme }: +, makeWrapper, networkmanager_openvpn, networkmanager_vpnc +, networkmanager_openconnect, udev, hicolor_icon_theme }: let pn = "network-manager-applet"; @@ -31,8 +32,18 @@ stdenv.mkDerivation rec { ]; postInstall = '' - ln -s ${networkmanager_openvpn}/etc/NetworkManager $out/etc/NetworkManager - ln -s ${networkmanager_openvpn}/lib/* $out/lib + mkdir -p $out/etc/NetworkManager/VPN + ln -s ${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name $out/etc/NetworkManager/VPN/nm-openvpn-service.name + ln -s ${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name $out/etc/NetworkManager/VPN/nm-vpnc-service.name + ln -s ${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name $out/etc/NetworkManager/VPN/nm-openconnect-service.name + mkdir -p $out/lib/NetworkManager + ln -s ${networkmanager_openvpn}/lib/NetworkManager/* $out/lib/NetworkManager/ + ln -s ${networkmanager_vpnc}/lib/NetworkManager/* $out/lib/NetworkManager/ + ln -s ${networkmanager_openconnect}/lib/NetworkManager/* $out/lib/NetworkManager/ + mkdir -p $out/libexec + ln -s ${networkmanager_openvpn}/libexec/* $out/libexec/ + ln -s ${networkmanager_vpnc}/libexec/* $out/libexec/ + ln -s ${networkmanager_openconnect}/libexec/* $out/libexec/ wrapProgram "$out/bin/nm-applet" \ --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \ 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