From 11a9e1c3c0b2595ea37b8812736427ffb32a0787 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 31 Oct 2017 20:08:05 +0900 Subject: [PATCH] l2tp: 1.2.4 -> 1.2.8 the new version brings a new panel in IPsec settings which allows to reenable old algorithms for IPsec phases 1/2 (dropped in recent libreswan/strongswan etc). Also updates the homepage with the new one. --- pkgs/tools/networking/network-manager/l2tp.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index b40afa605e3..f8047abe1bd 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-l2tp-service.c + substituteInPlace ./Makefile.am \ + --replace '$(sysconfdir)/dbus-1/system.d' "$out/etc/dbus-1/system.d" + substituteInPlace ./src/nm-l2tp-service.c \ --replace /sbin/ipsec ${strongswan}/bin/ipsec \ --replace /sbin/xl2tpd ${xl2tpd}/bin/xl2tpd @@ -38,11 +41,16 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; + configureFlags = [ + "--with-gnome=${if withGnome then "yes" else "no"}" + "--localstatedir=/var" + ] ; + meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; - homepage = https://github.com/nm-l2tp/network-manager-l2tp; + homepage = http://github.com/nm-l2tp/network-manager-l2tp; license = licenses.gpl2; maintainers = with maintainers; [ abbradar obadz ]; };