mpv: add vapoursynth support

pkgs/applications/video/mpv/default.nix

@@ -1,8 +1,18 @@
-{ stdenv, fetchurl, fetchFromGitHub, docutils, makeWrapper, perl, pkgconfig
+{ stdenv, fetchurl, fetchFromGitHub, makeWrapper
-, python, which, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs
+, docutils, perl, pkgconfig, python3, which, ffmpeg
-, lua, lua5_sockets
+, freefont_ttf, freetype, libass, libpthreadstubs
-, libuchardet, rubberband
+, lua, lua5_sockets, libuchardet, rubberband
-, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
+
+, x11Support ? true,
+    mesa       ? null,
+    libX11     ? null,
+    libXext    ? null,
+    libXxf86vm ? null
+
+, waylandSupport ? false,
+    wayland      ? null,
+    libxkbcommon ? null
+
 , xineramaSupport    ? true,  libXinerama   ? null
 , xvSupport          ? true,  libXv         ? null
 , sdl2Support        ? true,  SDL2          ? null
@@ -14,43 +24,47 @@
 , bluraySupport      ? true,  libbluray     ? null
 , speexSupport       ? true,  speex         ? null
 , theoraSupport      ? true,  libtheora     ? null
-, jackaudioSupport ? false, libjack2 ? null
 , pulseSupport       ? true,  libpulseaudio ? null
 , bs2bSupport        ? true,  libbs2b       ? null
-# For screenshots
-, libpngSupport ? true, libpng ? null
-# for Youtube support
-, youtubeSupport ? true, youtube-dl ? null
 , cacaSupport        ? true,  libcaca       ? null
+, libpngSupport      ? true,  libpng        ? null
+, youtubeSupport     ? true,  youtube-dl    ? null
+, vapoursynthSupport ? false, vapoursynth   ? null
+, jackaudioSupport   ? false, libjack2      ? null
 , vaapiSupport       ? false, libva         ? null
-, waylandSupport ? false, wayland ? null, libxkbcommon ? null
+
 # scripts you want to be loaded by default
 , scripts ? []
 }:
 
-assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
+with stdenv.lib;
-assert xineramaSupport -> (libXinerama != null && x11Support);
-assert xvSupport -> (libXv != null && x11Support);
-assert sdl2Support -> SDL2 != null;
-assert alsaSupport -> alsaLib != null;
-assert screenSaverSupport -> libXScrnSaver != null;
-assert vdpauSupport -> libvdpau != null;
-assert dvdreadSupport -> libdvdread != null;
-assert dvdnavSupport -> libdvdnav != null;
-assert bluraySupport -> libbluray != null;
-assert speexSupport -> speex != null;
-assert theoraSupport -> libtheora != null;
-assert jackaudioSupport -> libjack2 != null;
-assert pulseSupport -> libpulseaudio != null;
-assert bs2bSupport -> libbs2b != null;
-assert libpngSupport -> libpng != null;
-assert youtubeSupport -> youtube-dl != null;
-assert cacaSupport -> libcaca != null;
-assert waylandSupport -> (wayland != null && libxkbcommon != null);
 
 let 
-  inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
+  available = x: x != null;
+in
+assert x11Support         -> all available [mesa libX11 libXext libXxf86vm];
+assert waylandSupport     -> all available [wayland libxkbcommon];
+assert xineramaSupport    -> x11Support && available libXinerama;
+assert xvSupport          -> x11Support && available libXv;
+assert sdl2Support        -> available SDL2;
+assert alsaSupport        -> available alsaLib;
+assert screenSaverSupport -> available libXScrnSaver;
+assert vdpauSupport       -> available libvdpau;
+assert dvdreadSupport     -> available libdvdread;
+assert dvdnavSupport      -> available libdvdnav;
+assert bluraySupport      -> available libbluray;
+assert speexSupport       -> available speex;
+assert theoraSupport      -> available libtheora;
+assert pulseSupport       -> available libpulseaudio;
+assert bs2bSupport        -> available libbs2b;
+assert cacaSupport        -> available libcaca;
+assert libpngSupport      -> available libpng;
+assert youtubeSupport     -> available youtube-dl;
+assert vapoursynthSupport -> available vapoursynth;
+assert jackaudioSupport   -> available libjack2;
+assert vaapiSupport       -> available libva;
 
+let
   # Purity: Waf is normally downloaded by bootstrap.py, but
   # for purity reasons this behavior should be avoided.
   wafVersion = "1.8.12";
@@ -59,9 +73,7 @@ let
              "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ];
     sha256 = "12y9c352zwliw0zk9jm2lhynsjcf5jy0k1qch1c1av8hnbm2pgq1";
   };
-in
+in stdenv.mkDerivation rec {
-
-stdenv.mkDerivation rec {
   name = "mpv-${version}";
   version = "0.19.0";
 
@@ -80,29 +92,29 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--enable-libmpv-shared"
+    "--enable-manpage-build"
+    "--enable-zsh-comp"
     "--disable-libmpv-static"
     "--disable-static-build"
-    "--enable-manpage-build"
     "--disable-build-date" # Purity
-    "--enable-zsh-comp"
+    (enableFeature vaapiSupport "vaapi")
-  ] ++ optional vaapiSupport "--enable-vaapi"
+    (enableFeature waylandSupport "wayland")
-  ++ optional waylandSupport "--enable-wayland";
+  ];
 
   configurePhase = ''
-    python ${waf} configure --prefix=$out $configureFlags
+    python3 ${waf} configure --prefix=$out $configureFlags
   '';
 
-  nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python which ];
+  nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ];
 
   buildInputs = [
-    ffmpeg freetype libass libpthreadstubs lua lua5_sockets libuchardet rubberband
+    ffmpeg freetype libass libpthreadstubs
-  ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
+    lua lua5_sockets libuchardet rubberband
-    ++ optional alsaSupport alsaLib
+  ] ++ optional alsaSupport        alsaLib
     ++ optional xvSupport          libXv
     ++ optional theoraSupport      libtheora
     ++ optional xineramaSupport    libXinerama
     ++ optional dvdreadSupport     libdvdread
-    ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
     ++ optional bluraySupport      libbluray
     ++ optional jackaudioSupport   libjack2
     ++ optional pulseSupport       libpulseaudio
@@ -115,25 +127,30 @@ stdenv.mkDerivation rec {
     ++ optional sdl2Support        SDL2
     ++ optional cacaSupport        libcaca
     ++ optional vaapiSupport       libva
+    ++ optional vapoursynthSupport vapoursynth
+    ++ optionals dvdnavSupport     [ libdvdnav libdvdnav.libdvdread ]
+    ++ optionals x11Support        [ libX11 libXext mesa libXxf86vm ]
     ++ optionals waylandSupport    [ wayland libxkbcommon ];
 
   enableParallelBuilding = true;
 
   buildPhase = ''
-    python ${waf} build
+    python3 ${waf} build
   '';
 
   installPhase = ''
-    python ${waf} install
+    python3 ${waf} install
 
     # Use a standard font
     mkdir -p $out/share/mpv
     ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
-  '' + optionalString youtubeSupport ''
     # Ensure youtube-dl is available in $PATH for MPV
     wrapProgram $out/bin/mpv \
+      --add-flags "--script=${concatStringsSep "," scripts}" \
+  '' + optionalString youtubeSupport ''
       --prefix PATH : "${youtube-dl}/bin" \
-      --add-flags "--script=${concatStringsSep "," scripts}"
+  '' + optionalString vapoursynthSupport ''
+      --prefix PYTHONPATH : "$(toPythonPath ${vapoursynth}):$PYTHONPATH"
   '';
 
   meta = with stdenv.lib; {