summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>2015-05-26 05:26:16 +0100
committerMateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>2015-05-26 05:28:16 +0100
commit1a6e124da84b4579097366f620ffa07b9186b876 (patch)
tree3fd0aebf6412578c49016b8a501b930851afc624 /pkgs/top-level
parentc8db08ee07e16164448aed24de37ff020d112337 (diff)
downloadnixlib-1a6e124da84b4579097366f620ffa07b9186b876.tar
nixlib-1a6e124da84b4579097366f620ffa07b9186b876.tar.gz
nixlib-1a6e124da84b4579097366f620ffa07b9186b876.tar.bz2
nixlib-1a6e124da84b4579097366f620ffa07b9186b876.tar.lz
nixlib-1a6e124da84b4579097366f620ffa07b9186b876.tar.xz
nixlib-1a6e124da84b4579097366f620ffa07b9186b876.tar.zst
nixlib-1a6e124da84b4579097366f620ffa07b9186b876.zip
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
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 3 insertions, 1 deletions
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 { };