diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-03-24 14:07:27 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-03-29 13:09:02 +0300 |
| commit | 0e8b27ea6d50a97bad73935daaed94055d4670b1 (patch) | |
| tree | 3cf8fe58ac8d382085f08807f08b871f7df50879 /pkgs/tools/networking/network-manager | |
| parent | fe263f4c7edff5850da6c036fb7842dbf3798773 (diff) | |
| download | nixlib-0e8b27ea6d50a97bad73935daaed94055d4670b1.tar nixlib-0e8b27ea6d50a97bad73935daaed94055d4670b1.tar.gz nixlib-0e8b27ea6d50a97bad73935daaed94055d4670b1.tar.bz2 nixlib-0e8b27ea6d50a97bad73935daaed94055d4670b1.tar.lz nixlib-0e8b27ea6d50a97bad73935daaed94055d4670b1.tar.xz nixlib-0e8b27ea6d50a97bad73935daaed94055d4670b1.tar.zst nixlib-0e8b27ea6d50a97bad73935daaed94055d4670b1.zip | |
networkmanager-l2tp: add package
Diffstat (limited to 'pkgs/tools/networking/network-manager')
| -rw-r--r-- | pkgs/tools/networking/network-manager/l2tp-purity.patch | 26 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/l2tp.nix | 42 |
2 files changed, 68 insertions, 0 deletions
diff --git a/pkgs/tools/networking/network-manager/l2tp-purity.patch b/pkgs/tools/networking/network-manager/l2tp-purity.patch new file mode 100644 index 000000000000..c9117c5325b6 --- /dev/null +++ b/pkgs/tools/networking/network-manager/l2tp-purity.patch @@ -0,0 +1,26 @@ +diff --git a/src/nm-l2tp-service.c b/src/nm-l2tp-service.c +index d2c9dc4..e61d3d2 100644 +--- a/src/nm-l2tp-service.c ++++ b/src/nm-l2tp-service.c +@@ -655,9 +655,7 @@ nm_find_ipsec (void) + { + static const char *ipsec_binary_paths[] = + { +- "/sbin/ipsec", +- "/usr/sbin/ipsec", +- "/usr/local/sbin/ipsec", ++ "@strongswan@/bin/ipsec", + NULL + }; + +@@ -677,9 +675,7 @@ nm_find_l2tpd (void) + { + static const char *l2tp_binary_paths[] = + { +- "/sbin/xl2tpd", +- "/usr/sbin/xl2tpd", +- "/usr/local/sbin/xl2tpd", ++ "@xl2tpd@/bin/xl2tpd", + NULL + }; + diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix new file mode 100644 index 000000000000..a104f321c12d --- /dev/null +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, substituteAll, automake, autoconf, libtool, intltool, pkgconfig +, networkmanager, ppp, xl2tpd, strongswan +, withGnome ? true, gnome3 }: + +stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-l2tp"; + version = "0.9.8.7"; + + src = fetchFromGitHub { + owner = "seriyps"; + repo = "NetworkManager-l2tp"; + rev = version; + sha256 = "07gl562p3f6l2wn64f3vvz1ygp3hsfhiwh4sn04c3fahfdys69zx"; + }; + + buildInputs = [ networkmanager ppp ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ]; + + nativeBuildInputs = [ automake autoconf libtool intltool pkgconfig ]; + + configureScript = "./autogen.sh"; + + configureFlags = + if withGnome then "--with-gnome" else "--without-gnome"; + + postConfigure = "sed 's/-Werror//g' -i Makefile */Makefile"; + + patches = + [ ( substituteAll { + src = ./l2tp-purity.patch; + inherit xl2tpd strongswan; + }) + ]; + + meta = with stdenv.lib; { + description = "L2TP plugin for NetworkManager"; + inherit (networkmanager.meta) platforms; + license = licenses.gpl2; + maintainers = with maintainers; [ abbradar ]; + }; +} |