diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-31 23:32:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-31 23:32:36 -0400 |
| commit | 6bf3d68b8d11c726c3b2105c6edd4125c0a7a859 (patch) | |
| tree | fb647ab328feeee3c326f3d0513b9dc132853bce | |
| parent | d3188e90a09b612aab59187a5a8d15c8bc9887a1 (diff) | |
| parent | 38cac86769abaa1e14d2dbe3b375fee802fb3b57 (diff) | |
| download | nixpkgs-6bf3d68b8d11c726c3b2105c6edd4125c0a7a859.tar nixpkgs-6bf3d68b8d11c726c3b2105c6edd4125c0a7a859.tar.gz nixpkgs-6bf3d68b8d11c726c3b2105c6edd4125c0a7a859.tar.bz2 nixpkgs-6bf3d68b8d11c726c3b2105c6edd4125c0a7a859.tar.lz nixpkgs-6bf3d68b8d11c726c3b2105c6edd4125c0a7a859.tar.xz nixpkgs-6bf3d68b8d11c726c3b2105c6edd4125c0a7a859.tar.zst nixpkgs-6bf3d68b8d11c726c3b2105c6edd4125c0a7a859.zip | |
Merge pull request #67842 from lopsided98/rtmpdump-openssl-1.1
rtmpdump: use OpenSSL 1.1 to fix gstreamer crash
| -rw-r--r-- | pkgs/tools/video/rtmpdump/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 18 insertions, 10 deletions
diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index af56ba3e7eb..06c035552e5 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, zlib +{ stdenv, fetchgit, fetchpatch, zlib , gnutlsSupport ? false, gnutls ? null, nettle ? null , opensslSupport ? true, openssl ? null }: @@ -9,17 +9,25 @@ assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSuppo assert opensslSupport -> openssl != null && !gnutlsSupport; with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rtmpdump"; - version = "2015-12-30"; + version = "2019-03-30"; src = fetchgit { - url = git://git.ffmpeg.org/rtmpdump; + url = "git://git.ffmpeg.org/rtmpdump"; # Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4') - rev = "fa8646daeb19dfd12c181f7d19de708d623704c0"; - sha256 = "17m9rmnnqyyzsnnxcdl8258hjmw16nxbj1n1lr7fj3kmcs189iig"; + rev = "c5f04a58fc2aeea6296ca7c44ee4734c18401aa3"; + sha256 = "07ias612jgmxpam9h418kvlag32da914jsnjsfyafklpnh8gdzjb"; }; + patches = [ + # Fix build with OpenSSL 1.1 + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-video/rtmpdump/files/rtmpdump-openssl-1.1.patch?id=1e7bef484f96e7647f5f0911d3c8caa48131c33b"; + sha256 = "1wds98pk8qr7shkfl8k49iirxiwd972h18w84bamiqln29wv6ql1"; + }) + ]; + makeFlags = [ ''prefix=$(out)'' ] ++ optional gnutlsSupport "CRYPTO=GNUTLS" ++ optional opensslSupport "CRYPTO=OPENSSL" @@ -32,9 +40,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + separateDebugInfo = true; + meta = { description = "Toolkit for RTMP streams"; - homepage = http://rtmpdump.mplayerhq.hu/; + homepage = "http://rtmpdump.mplayerhq.hu/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd38fdf7099..61d003e4c03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5792,9 +5792,7 @@ in rt = callPackage ../servers/rt { }; - rtmpdump = callPackage ../tools/video/rtmpdump { - openssl = openssl_1_0_2; - }; + rtmpdump = callPackage ../tools/video/rtmpdump { }; rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; }; reaverwps = callPackage ../tools/networking/reaver-wps {}; |