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

use gnutls rtmpdump for ffmpeg, as it doesnot build otherwise

Browse Source
This commit is contained in:
Aristid Breitkreuz 2015-05-03 11:47:07 +00:00
parent 6f5bfcdb33
commit 365fd9efeb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -109,7 +109,7 @@
, openjpeg_1 ? null # JPEG 2000 de/encoder , openjpeg_1 ? null # JPEG 2000 de/encoder
, opensslExtlib ? false, openssl ? null , opensslExtlib ? false, openssl ? null
, pulseaudio ? null # Pulseaudio input support , pulseaudio ? null # Pulseaudio input support
, rtmpdump ? null # RTMP[E] support , rtmpdump_gnutls ? null # RTMP[E] support
#, libquvi ? null # Quvi input support #, libquvi ? null # Quvi input support
, sambaExtlib ? false, samba ? null # Samba protocol , sambaExtlib ? false, samba ? null # Samba protocol
#, schroedinger ? null # Dirac de/encoder #, schroedinger ? null # Dirac de/encoder
@ -410,7 +410,7 @@ stdenv.mkDerivation rec {
(mkFlag (opensslExtlib && gplLicensing) "0.9" "openssl") (mkFlag (opensslExtlib && gplLicensing) "0.9" "openssl")
(mkFlag (disDarwinFix (pulseaudio != null)) "0.9" "libpulse") (mkFlag (disDarwinFix (pulseaudio != null)) "0.9" "libpulse")
#(mkFlag quvi "2.0" "libquvi") #(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 (schroedinger != null) "0.5" "libschroedinger")
#(mkFlag (shine != null) "2.0" "libshine") #(mkFlag (shine != null) "2.0" "libshine")
(mkFlag (disDarwinFix (sambaExtlib && gplLicensing && version3Licensing)) "2.3" "libsmbclient") (mkFlag (disDarwinFix (sambaExtlib && gplLicensing && version3Licensing)) "2.3" "libsmbclient")
@ -457,7 +457,7 @@ stdenv.mkDerivation rec {
++ optionals nonfreeLicensing [ faac faad2 fdk_aac openssl ] ++ optionals nonfreeLicensing [ faac faad2 fdk_aac openssl ]
++ optionals (!isDarwin) [ ++ optionals (!isDarwin) [
frei0r /* game-music-emu gsm jack2 */ libmodplug libssh libvpx /* openal */ 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 ] ++ optional (!isDarwin && !isCygwin) libva
++ optionals isLinux [ alsaLib libraw1394 /* v4l_utils */ ]; ++ optionals isLinux [ alsaLib libraw1394 /* v4l_utils */ ];

1
pkgs/top-level/all-packages.nix
View File

@ -2592,6 +2592,7 @@ let
redmine = callPackage ../applications/version-management/redmine { }; redmine = callPackage ../applications/version-management/redmine { };
rtmpdump = callPackage ../tools/video/rtmpdump { }; rtmpdump = callPackage ../tools/video/rtmpdump { };
rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; };
reaverwps = callPackage ../tools/networking/reaver-wps {}; reaverwps = callPackage ../tools/networking/reaver-wps {};