From 239fd0fbf52fcd4e61cfe03a79c61a8e77fa2048 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 25 Feb 2023 14:52:40 +0100 Subject: [PATCH] sslsplit: fix build with openssl_3 --- pkgs/tools/networking/sslsplit/default.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/sslsplit/default.nix b/pkgs/tools/networking/sslsplit/default.nix index c3a343d7fa1..6712d44569c 100644 --- a/pkgs/tools/networking/sslsplit/default.nix +++ b/pkgs/tools/networking/sslsplit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libevent, libpcap, libnet, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, libevent, libpcap, libnet, zlib }: stdenv.mkDerivation rec { pname = "sslsplit"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1p43z9ln5rbc76v0j1k3r4nhvfw71hq8jzsallb54z9hvwfvqp3l"; }; + patches = [ + (fetchpatch { + name = "fix-openssl-3-build.patch"; + url = "https://github.com/droe/sslsplit/commit/e17de8454a65d2b9ba432856971405dfcf1e7522.patch"; + hash = "sha256-sEwP7f2PSqXdMqLub9zrfQgH8I4oe9klVPzNpJjrPJ8="; + }) + ]; + buildInputs = [ openssl libevent libpcap libnet zlib ]; makeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27359d4df42..3f685ba58dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12258,9 +12258,7 @@ with pkgs; ssldump = callPackage ../tools/networking/ssldump { }; - sslsplit = callPackage ../tools/networking/sslsplit { - openssl = openssl_1_1; - }; + sslsplit = callPackage ../tools/networking/sslsplit { }; sstp = callPackage ../tools/networking/sstp {};