From d574780365c5cf2e70e006db1640448d07644c64 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 6 Apr 2019 21:35:23 +0900 Subject: 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. --- pkgs/tools/networking/ppp/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/networking/ppp') diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index cea8a3f133f4..26dc71b7d619 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 -- cgit 1.4.1