diff options
| author | ajs124 <git@ajs124.de> | 2022-12-14 22:31:17 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-12-15 16:28:28 +0000 |
| commit | 27f7272e3ca7edaaceb2f07e7789ca587d30d31f (patch) | |
| tree | 6e83fa43470ed56cdbca47964e140a223fe30a90 | |
| parent | coturn: override libevent openssl (diff) | |
| download | nixpkgs-27f7272e3ca7edaaceb2f07e7789ca587d30d31f.tar.gz | |
coturn: don't build against openssl_1_1 anymore
(cherry picked from commit c8528b82d289c86011eff65fbcb3e93568b33b15)
| -rw-r--r-- | pkgs/servers/coturn/default.nix | 6 | ||||
| -rw-r--r-- | 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 32e83a9c21c2..152494afded7 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -35,6 +35,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 25acc81df8b3..5ed517ac9218 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3657,9 +3657,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 {}; |