diff options
| author | James Cook <jcook@cs.berkeley.edu> | 2019-04-07 15:50:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-07 15:50:33 +0000 |
| commit | d2326cc24a6cd1b03913116cadb729a4de0c29ea (patch) | |
| tree | a42ebb460c8745e277027c695dee9118c70beef9 /pkgs/tools/networking | |
| parent | 8eba1ed877baae748d063ff6c62b613905d13f78 (diff) | |
| parent | d574780365c5cf2e70e006db1640448d07644c64 (diff) | |
| download | nixlib-d2326cc24a6cd1b03913116cadb729a4de0c29ea.tar nixlib-d2326cc24a6cd1b03913116cadb729a4de0c29ea.tar.gz nixlib-d2326cc24a6cd1b03913116cadb729a4de0c29ea.tar.bz2 nixlib-d2326cc24a6cd1b03913116cadb729a4de0c29ea.tar.lz nixlib-d2326cc24a6cd1b03913116cadb729a4de0c29ea.tar.xz nixlib-d2326cc24a6cd1b03913116cadb729a4de0c29ea.tar.zst nixlib-d2326cc24a6cd1b03913116cadb729a4de0c29ea.zip | |
Merge pull request #59064 from teto/ppp
ppp: add eap-tls patch
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/ppp/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
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 |