From 1a6e124da84b4579097366f620ffa07b9186b876 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Tue, 26 May 2015 05:26:16 +0100 Subject: [PATCH] mpv: use ffmpeg-full when using youtubeSupport 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 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95266a23863d..234593906acb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };