diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-08 02:07:34 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-08 02:07:34 +0100 |
| commit | e6c0c98940bc72280216639cd9fb16745b7e1103 (patch) | |
| tree | 365c0fb567ff279f2475445a8ba001776629df0e /pkgs/servers/misc | |
| parent | 5c072a088d7b0efd3a8185953fe21efcd6c1d94a (diff) | |
| parent | 9414948a5a19463acce5a7f2b2206c39ecb6359f (diff) | |
| download | nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.gz nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.bz2 nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.lz nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.xz nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.zst nixpkgs-e6c0c98940bc72280216639cd9fb16745b7e1103.zip | |
Merge branch 'master' into staging-next
zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
Diffstat (limited to 'pkgs/servers/misc')
| -rw-r--r-- | pkgs/servers/misc/oven-media-engine/default.nix | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 7faf8a9cfee..d6bdef68732 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , srt , ffmpeg_3_4 , bc @@ -12,6 +13,7 @@ , libopus , srtp , jemalloc +, pcre2 }: let @@ -27,21 +29,30 @@ let in stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.10.8"; + version = "0.10.9-hotfix"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "ec4yvS+4/rTBHGEx2OP0yoNGDtzPucFOcZJ0o0cCAHg="; + sha256 = "1fhria0vwqsgmsglv5gn858li33vfy2dwy1f1qdd2jwikskb53am"; }; + 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 pkgconfig perl ]; - buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc ]; + buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 ]; preBuild = '' patchShebangs core/colorg++ @@ -62,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source streaming video service with sub-second latency"; homepage = "https://ovenmediaengine.com"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ lukegb ]; platforms = [ "x86_64-linux" ]; }; |