diff options
| author | codyopel <codyopel@gmail.com> | 2015-06-01 07:08:21 -0400 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-06-01 13:19:08 +0200 |
| commit | 3400fa038f8ef79690100d10eb9110e2fe264cee (patch) | |
| tree | 37cb8e560739bf43ffe3062fcfea6ddb2c9df22e /pkgs/tools/video | |
| parent | 4d70496ebb38796fea4f5c81079e031efb3fd959 (diff) | |
rtmpdump_gnutls: add missing lib nettle & use git date format
Close #8112.
Diffstat (limited to 'pkgs/tools/video')
| -rw-r--r-- | pkgs/tools/video/rtmpdump/default.nix | 10 |
1 files 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 = { |