summary refs log tree commit diff
path: root/pkgs/tools/networking/ppp
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2019-04-06 21:35:23 +0900
committerMatthieu Coudron <mattator@gmail.com>2019-04-06 22:18:21 +0900
commitd574780365c5cf2e70e006db1640448d07644c64 (patch)
tree93158a08d0fb2180458f286bd01dfed067b99417 /pkgs/tools/networking/ppp
parent21d1b195c885f5bcef49f2d0485246ed8979f0a8 (diff)
downloadnixpkgs-d574780365c5cf2e70e006db1640448d07644c64.tar
nixpkgs-d574780365c5cf2e70e006db1640448d07644c64.tar.gz
nixpkgs-d574780365c5cf2e70e006db1640448d07644c64.tar.bz2
nixpkgs-d574780365c5cf2e70e006db1640448d07644c64.tar.lz
nixpkgs-d574780365c5cf2e70e006db1640448d07644c64.tar.xz
nixpkgs-d574780365c5cf2e70e006db1640448d07644c64.tar.zst
nixpkgs-d574780365c5cf2e70e006db1640448d07644c64.zip
ppp: add eap-tls patch
else NetworkManager-l2tp fails with:
checking whether EAP-TLS patch has been applied to pppd... no
configure: error: EAP-TLS patch has not been applied to pppd

This check has been added in https://github.com/nm-l2tp/NetworkManager-l2tp/commit/56e82afe1fa4193ac60a93b7724cd9cc65797af1,
i.e. l2tp version 1.7.0.
Diffstat (limited to 'pkgs/tools/networking/ppp')
-rw-r--r--pkgs/tools/networking/ppp/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index cea8a3f133f..26dc71b7d61 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, substituteAll, libpcap }:
+{ stdenv, fetchurl, substituteAll, libpcap, openssl }:
 
 stdenv.mkDerivation rec {
   version = "2.4.7";
@@ -27,10 +27,14 @@ stdenv.mkDerivation rec {
         url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/0016-pppoe-include-netinet-in.h-before-linux-in.h.patch";
         sha256 = "1xnmqn02kc6g5y84xynjwnpv9cvrfn3nyv7h7r8j8xi7qf2aj4q8";
       })
+      (fetchurl {
+        url = https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch;
+        sha256 = "04war8l5szql53l36043hvzgfwqp3v76kj8brbz7wlf7vs2mlkia";
+      })
       ./musl-fix-headers.patch
     ];
 
-  buildInputs = [ libpcap ];
+  buildInputs = [ libpcap openssl ];
 
   postPatch = ''
     # strip is not found when cross compiling with seemingly no way to point