tjh.dev
rtmpdump_gnutls: add missing lib nettle & use git date format
Close #8112.
authored by codyopel and committed by Vladimír Čunát 3400fa03 4d70496e
+5
-5
pkgs/tools/video/rtmpdump/default.nix
+5
-5
pkgs/tools/video/rtmpdump/default.nix
···
1
1
{ stdenv, fetchgit, zlib
2
-
, gnutlsSupport ? false, gnutls ? null
2
+
, gnutlsSupport ? false, gnutls ? null, nettle ? null
3
3
, opensslSupport ? true, openssl ? null
4
4
}:
5
5
6
6
# Must have an ssl library enabled
7
7
assert (gnutlsSupport || opensslSupport);
8
-
assert gnutlsSupport -> ((gnutlsSupport != null) && (!opensslSupport));
9
-
assert opensslSupport -> ((openssl != null) && (!gnutlsSupport));
8
+
assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSupport;
9
+
assert opensslSupport -> openssl != null && !gnutlsSupport;
10
10
11
11
with stdenv.lib;
12
12
stdenv.mkDerivation rec {
13
13
name = "rtmpdump-${version}";
14
-
version = "2.4";
14
+
version = "2015-01-15";
15
15
16
16
src = fetchgit {
17
17
url = git://git.ffmpeg.org/rtmpdump;
···
27
27
++ optional stdenv.cc.isClang "CC=clang";
28
28
29
29
propagatedBuildInputs = [ zlib ]
30
-
++ optional gnutlsSupport gnutls
30
+
++ optionals gnutlsSupport [ gnutls nettle ]
31
31
++ optional opensslSupport openssl;
32
32
33
33
meta = {