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

rtmpdump: fix build with OpenSSL 1.1

Browse Source
This commit is contained in:
Ben Wolsieffer 2019-08-30 23:40:32 -04:00
parent ea3bae4f4d
commit 29d9be2e72
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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
, opensslSupport ? true, openssl ? null
}:
@ -20,6 +20,14 @@ stdenv.mkDerivation rec {
sha256 = "17m9rmnnqyyzsnnxcdl8258hjmw16nxbj1n1lr7fj3kmcs189iig";
};
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"

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

@ -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 {};