From 6f6dbe2dcdc16467c64e9eae4d4344f396390119 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 14 Dec 2022 22:30:55 +0100 Subject: [PATCH 1/2] coturn: override libevent openssl libevent propagates openssl coturn crashes when it has two different versions of openssl --- pkgs/servers/coturn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 6b9bee6dcdae..466da7c6c13d 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl - libevent + (libevent.override { inherit openssl; }) libprom libpromhttp libmicrohttpd From c8528b82d289c86011eff65fbcb3e93568b33b15 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 14 Dec 2022 22:31:17 +0100 Subject: [PATCH 2/2] coturn: don't build against openssl_1_1 anymore --- pkgs/servers/coturn/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 466da7c6c13d..b8c56f548661 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -38,6 +38,12 @@ stdenv.mkDerivation rec { patches = [ ./pure-configure.patch + + # fix build against openssl 3.x + (fetchpatch { + url = "https://github.com/coturn/coturn/commit/4ce784a8781ab086c150e2b9f5641b1a37fd9b31.patch"; + hash = "sha256-Jx8XNXrgq0ockm1zjwRzfvSS3fVrVyVvQY1l0CpcR3Q="; + }) ]; # Workaround build failure on -fno-common toolchains like upstream diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 825af969b790..6ecb078ddf64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4057,9 +4057,7 @@ with pkgs; cot = with python3Packages; toPythonApplication cot; - coturn = callPackage ../servers/coturn { - openssl = openssl_1_1; - }; + coturn = callPackage ../servers/coturn { }; coursier = callPackage ../development/tools/coursier {};