diff options
author | adisbladis <adisbladis@gmail.com> | 2019-01-19 12:54:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-19 12:54:23 +0000 |
commit | 227104215dee4d2bb5cb2b3ffd5a6c5179735d81 (patch) | |
tree | c9ff8617fc9cf90d5f54bbdef351f20f9ba7c7bc /pkgs/applications/video | |
parent | abd658e93283f13f530d2d31fc41f346649c7b6f (diff) | |
parent | dfe2453ce596fff968b65cd93298ec470e3b7405 (diff) |
Merge pull request #54290 from adisbladis/mpv-vulkan
mpv: Add vulkan support
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 62a517e80ea6b..8be842dfc68c3 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -19,6 +19,11 @@ , libcdio ? null , libcdio-paranoia ? null +, vulkanSupport ? stdenv.isLinux + , shaderc ? null + , vulkan-headers ? null + , vulkan-loader ? null + , alsaSupport ? true, alsaLib ? null , bluraySupport ? true, libbluray ? null , bs2bSupport ? true, libbs2b ? null @@ -163,6 +168,7 @@ in stdenv.mkDerivation rec { ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ] + ++ optionals vulkanSupport [ shaderc vulkan-headers vulkan-loader ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Cocoa CoreAudio ]); @@ -176,7 +182,7 @@ in stdenv.mkDerivation rec { ''; # Ensure youtube-dl is available in $PATH for mpv - wrapperFlags = + wrapperFlags = let getPath = type : "${luasocket}/lib/lua/${lua.luaversion}/?.${type};" + "${luasocket}/share/lua/${lua.luaversion}/?.${type}"; |