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

rtmpdump_gnutls: add missing lib nettle & use git date format

Browse Source 
Close #8112.
This commit is contained in:
codyopel 2015-06-01 07:08:21 -04:00 committed by Vladimír Čunát
parent 4d70496ebb
commit 3400fa038f
1 changed files with 5 additions and 5 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,17 +1,17 @@
{ stdenv, fetchgit, zlib { stdenv, fetchgit, zlib
, gnutlsSupport ? false, gnutls ? null , gnutlsSupport ? false, gnutls ? null, nettle ? null
, opensslSupport ? true, openssl ? null , opensslSupport ? true, openssl ? null
}: }:
# Must have an ssl library enabled # Must have an ssl library enabled
assert (gnutlsSupport || opensslSupport); assert (gnutlsSupport || opensslSupport);
assert gnutlsSupport -> ((gnutlsSupport != null) && (!opensslSupport)); assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSupport;
assert opensslSupport -> ((openssl != null) && (!gnutlsSupport)); assert opensslSupport -> openssl != null && !gnutlsSupport;
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rtmpdump-${version}"; name = "rtmpdump-${version}";
version = "2.4"; version = "2015-01-15";
src = fetchgit { src = fetchgit {
url = git://git.ffmpeg.org/rtmpdump; url = git://git.ffmpeg.org/rtmpdump;
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
++ optional stdenv.cc.isClang "CC=clang"; ++ optional stdenv.cc.isClang "CC=clang";
propagatedBuildInputs = [ zlib ] propagatedBuildInputs = [ zlib ]
++ optional gnutlsSupport gnutls ++ optionals gnutlsSupport [ gnutls nettle ]
++ optional opensslSupport openssl; ++ optional opensslSupport openssl;
meta = { meta = {