From 365fd9efeb8e5d0918e641fc24922bd9e48041a6 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 3 May 2015 11:47:07 +0000 Subject: [PATCH] use gnutls rtmpdump for ffmpeg, as it doesnot build otherwise --- pkgs/development/libraries/ffmpeg/generic.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d3a68508246..c33fabeb416 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -109,7 +109,7 @@ , openjpeg_1 ? null # JPEG 2000 de/encoder , opensslExtlib ? false, openssl ? null , pulseaudio ? null # Pulseaudio input support -, rtmpdump ? null # RTMP[E] support +, rtmpdump_gnutls ? null # RTMP[E] support #, libquvi ? null # Quvi input support , sambaExtlib ? false, samba ? null # Samba protocol #, schroedinger ? null # Dirac de/encoder @@ -410,7 +410,7 @@ stdenv.mkDerivation rec { (mkFlag (opensslExtlib && gplLicensing) "0.9" "openssl") (mkFlag (disDarwinFix (pulseaudio != null)) "0.9" "libpulse") #(mkFlag quvi "2.0" "libquvi") - (mkFlag (disDarwinFix (rtmpdump != null)) "0.6" "librtmp") + (mkFlag (disDarwinFix (rtmpdump_gnutls != null)) "0.6" "librtmp") #(mkFlag (schroedinger != null) "0.5" "libschroedinger") #(mkFlag (shine != null) "2.0" "libshine") (mkFlag (disDarwinFix (sambaExtlib && gplLicensing && version3Licensing)) "2.3" "libsmbclient") @@ -457,7 +457,7 @@ stdenv.mkDerivation rec { ++ optionals nonfreeLicensing [ faac faad2 fdk_aac openssl ] ++ optionals (!isDarwin) [ frei0r /* game-music-emu gsm jack2 */ libmodplug libssh libvpx /* openal */ - openjpeg_1 pulseaudio rtmpdump vid-stab wavpack x265 /* xavs */ + openjpeg_1 pulseaudio rtmpdump_gnutls vid-stab wavpack x265 /* xavs */ ] ++ optional (!isDarwin && !isCygwin) libva ++ optionals isLinux [ alsaLib libraw1394 /* v4l_utils */ ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d20f1ff232..c75a8730a14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2592,6 +2592,7 @@ let redmine = callPackage ../applications/version-management/redmine { }; rtmpdump = callPackage ../tools/video/rtmpdump { }; + rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; }; reaverwps = callPackage ../tools/networking/reaver-wps {};