From 3400fa038f8ef79690100d10eb9110e2fe264cee Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Mon, 1 Jun 2015 07:08:21 -0400
Subject: [PATCH] rtmpdump_gnutls: add missing lib nettle & use git date format
Close #8112.
---
pkgs/tools/video/rtmpdump/default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index 29f2a1c448d9..9987d697cf0b 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchgit, zlib
-, gnutlsSupport ? false, gnutls ? null
+, gnutlsSupport ? false, gnutls ? null, nettle ? null
, opensslSupport ? true, openssl ? null
}:
# Must have an ssl library enabled
assert (gnutlsSupport || opensslSupport);
-assert gnutlsSupport -> ((gnutlsSupport != null) && (!opensslSupport));
-assert opensslSupport -> ((openssl != null) && (!gnutlsSupport));
+assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSupport;
+assert opensslSupport -> openssl != null && !gnutlsSupport;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "rtmpdump-${version}";
- version = "2.4";
+ version = "2015-01-15";
src = fetchgit {
url = git://git.ffmpeg.org/rtmpdump;
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
++ optional stdenv.cc.isClang "CC=clang";
propagatedBuildInputs = [ zlib ]
- ++ optional gnutlsSupport gnutls
+ ++ optionals gnutlsSupport [ gnutls nettle ]
++ optional opensslSupport openssl;
meta = {