From 740a0891df37bd83d36a930563c24db72a6ddb76 Mon Sep 17 00:00:00 2001 From: Greaka Date: Sat, 18 Dec 2021 02:57:06 +0100 Subject: [PATCH] oven-media-engine: 0.10.9-hotfix -> 0.12.9 --- .../misc/oven-media-engine/default.nix | 29 ++++--------------- 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 6a63292301b5..831d2047b4e6 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -6,53 +6,34 @@ , bc , pkg-config , perl -, openssl +, openssl_3_0 , zlib , ffmpeg , libvpx , libopus +, libuuid , srtp , jemalloc , pcre2 }: -let - ffmpeg = ffmpeg_3_4.overrideAttrs (super: { - pname = "${super.pname}-ovenmediaengine"; - src = fetchFromGitHub { - owner = "Airensoft"; - repo = "FFmpeg"; - rev = "142b4bb64b64e337f80066e6af935a68627fedae"; # on branch ome/3.4 - sha256 = "0fla3940q3z0c0ik2xzkbvdfvrdg06ban7wi6y94y8mcipszpp11"; - }; - }); -in stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.10.9-hotfix"; + version = "0.12.9"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "1fhria0vwqsgmsglv5gn858li33vfy2dwy1f1qdd2jwikskb53am"; + sha256 = "0d3ymw747frl40w5d6r33lf1s72v7fiv742yjr1m6la2phb9h834"; }; - patches = [ - (fetchpatch { - # Needed to fix compilation under GCC 10. - url = "https://github.com/AirenSoft/OvenMediaEngine/commit/ad83e1d2226445d649e4b7e0c75106e31af4940d.patch"; - sha256 = "1zk1rgi1wsjl6gdx3hdmgxlgindv6a3lsnkwcgi87ga9abw4vafw"; - stripLen = 1; - }) - ]; - sourceRoot = "source/src"; makeFlags = "release CONFIG_LIBRARY_PATHS= CONFIG_PKG_PATHS= GLOBAL_CC=$(CC) GLOBAL_CXX=$(CXX) GLOBAL_LD=$(CXX) SHELL=${stdenv.shell}"; enableParallelBuilding = true; nativeBuildInputs = [ bc pkg-config perl ]; - buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 ]; + buildInputs = [ openssl_3_0 srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid ]; preBuild = '' patchShebangs core/colorg++