alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

mpv: use ffmpeg-full when using youtubeSupport

Browse source 
We need networking and potentially ssl/tls compiled into ffmpeg but the
minimal ffmpeg_x wrappers no longer offer that. We could of course use
ffmpeg-full and slim it down to just what we need but we'd end up
building ffmpeg twice, might as well stick with full
This commit is contained in:
Mateusz Kowalczyk 2015-05-26 05:26:16 +01:00
parent c8db08ee07
commit 1a6e124da8
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View file

@ -11697,13 +11697,15 @@ let
# !!! should depend on MPlayer
};
mpv = callPackage ../applications/video/mpv {
mpv = callPackage ../applications/video/mpv rec {
lua = lua5_1;
lua5_sockets = lua5_1_sockets;
bs2bSupport = config.mpv.bs2bSupport or true;
youtubeSupport = config.mpv.youtubeSupport or true;
cacaSupport = config.mpv.cacaSupport or true;
vaapiSupport = config.mpv.vaapiSupport or false;
# YouTube needs network support and potentially openssl/tls
ffmpeg = if youtubeSupport then ffmpeg-full else ffmpeg;
};
mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };