public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67842 from lopsided98/rtmpdump-openssl-1.1 

rtmpdump: use OpenSSL 1.1 to fix gstreamer crash
This commit is contained in:
worldofpeace 2019-08-31 23:32:36 -04:00 committed by GitHub
parent d3188e90a0 38cac86769
commit 6bf3d68b8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/tools/video/rtmpdump/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, zlib { stdenv, fetchgit, fetchpatch, zlib
, gnutlsSupport ? false, gnutls ? null, nettle ? null , gnutlsSupport ? false, gnutls ? null, nettle ? null
, opensslSupport ? true, openssl ? null , opensslSupport ? true, openssl ? null
}: }:
@ -9,17 +9,25 @@ assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSuppo
assert opensslSupport -> openssl != null && !gnutlsSupport; assert opensslSupport -> openssl != null && !gnutlsSupport;
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "rtmpdump"; pname = "rtmpdump";
version = "2015-12-30"; version = "2019-03-30";
src = fetchgit { 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') # Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4')
rev = "fa8646daeb19dfd12c181f7d19de708d623704c0"; rev = "c5f04a58fc2aeea6296ca7c44ee4734c18401aa3";
sha256 = "17m9rmnnqyyzsnnxcdl8258hjmw16nxbj1n1lr7fj3kmcs189iig"; 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)'' ] makeFlags = [ ''prefix=$(out)'' ]
++ optional gnutlsSupport "CRYPTO=GNUTLS" ++ optional gnutlsSupport "CRYPTO=GNUTLS"
++ optional opensslSupport "CRYPTO=OPENSSL" ++ optional opensslSupport "CRYPTO=OPENSSL"
@ -32,9 +40,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
separateDebugInfo = true;
meta = { meta = {
description = "Toolkit for RTMP streams"; description = "Toolkit for RTMP streams";
homepage = http://rtmpdump.mplayerhq.hu/; homepage = "http://rtmpdump.mplayerhq.hu/";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ codyopel ]; maintainers = with maintainers; [ codyopel ];

4
pkgs/top-level/all-packages.nix
View File

@ -5792,9 +5792,7 @@ in
rt = callPackage ../servers/rt { }; rt = callPackage ../servers/rt { };
rtmpdump = callPackage ../tools/video/rtmpdump { rtmpdump = callPackage ../tools/video/rtmpdump { };
openssl = openssl_1_0_2;
};
rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; }; rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; };
reaverwps = callPackage ../tools/networking/reaver-wps {}; reaverwps = callPackage ../tools/networking/reaver-wps {};