diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-02-28 00:12:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 00:12:19 +0000 |
| commit | 700a9631119b88ce2dce805d804d7d24f66b8580 (patch) | |
| tree | 781d74303a59a305821384b151d28537c8c9a953 /pkgs/top-level | |
| parent | d31fb808af6273afd076cc6333fd0d7f28a675de (diff) | |
| parent | c269fc884a8dfadc4afcd3e28dd78dbf8e0bb755 (diff) | |
| download | nixlib-700a9631119b88ce2dce805d804d7d24f66b8580.tar nixlib-700a9631119b88ce2dce805d804d7d24f66b8580.tar.gz nixlib-700a9631119b88ce2dce805d804d7d24f66b8580.tar.bz2 nixlib-700a9631119b88ce2dce805d804d7d24f66b8580.tar.lz nixlib-700a9631119b88ce2dce805d804d7d24f66b8580.tar.xz nixlib-700a9631119b88ce2dce805d804d7d24f66b8580.tar.zst nixlib-700a9631119b88ce2dce805d804d7d24f66b8580.zip | |
Merge pull request #35885 from rnhmjoj/mpv
mpv: fix lua library paths and clean up
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3737ff1852aa..c223bbb13cc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16554,11 +16554,19 @@ with pkgs; }; mpv = callPackage ../applications/video/mpv rec { - lua = lua5_1; - lua5_sockets = lua5_1_sockets; + inherit (luaPackages) luasocket; youtube-dl = pythonPackages.youtube-dl; - libva = libva-full; - waylandSupport = stdenv.isLinux; + libva = libva-full; + waylandSupport = stdenv.isLinux; + alsaSupport = !stdenv.isDarwin; + pulseSupport = !stdenv.isDarwin; + rubberbandSupport = !stdenv.isDarwin; + dvdreadSupport = !stdenv.isDarwin; + dvdnavSupport = !stdenv.isDarwin; + drmSupport = !stdenv.isDarwin; + x11Support = !stdenv.isDarwin; + xineramaSupport = !stdenv.isDarwin; + xvSupport = !stdenv.isDarwin; }; mpvScripts = { |