From 29d9be2e720e15e13962215b63200a3081b183b0 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 30 Aug 2019 23:40:32 -0400 Subject: [PATCH] rtmpdump: fix build with OpenSSL 1.1 --- pkgs/tools/video/rtmpdump/default.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index af56ba3e7ebb..e5615093e481 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 }: @@ -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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccdb4e25cd95..9eca129bf31d 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 {};