summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2017-10-31 20:08:05 +0900
committerMatthieu Coudron <mattator@gmail.com>2018-02-07 13:21:49 +0900
commit11a9e1c3c0b2595ea37b8812736427ffb32a0787 (patch)
treecfd97dcb0e5ebc2d915ae4b378ef6b042e34a7cd /pkgs
parentd80057f245e65e5ef07ec7e488941ac3d4fc3ee3 (diff)
downloadnixpkgs-11a9e1c3c0b2595ea37b8812736427ffb32a0787.tar
nixpkgs-11a9e1c3c0b2595ea37b8812736427ffb32a0787.tar.gz
nixpkgs-11a9e1c3c0b2595ea37b8812736427ffb32a0787.tar.bz2
nixpkgs-11a9e1c3c0b2595ea37b8812736427ffb32a0787.tar.lz
nixpkgs-11a9e1c3c0b2595ea37b8812736427ffb32a0787.tar.xz
nixpkgs-11a9e1c3c0b2595ea37b8812736427ffb32a0787.tar.zst
nixpkgs-11a9e1c3c0b2595ea37b8812736427ffb32a0787.zip
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.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/networking/network-manager/l2tp.nix10
1 files changed, 9 insertions, 1 deletions
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 ];
   };