diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-11-15 19:12:05 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-15 19:12:05 -0300 |
| commit | 506f41b6add695a75c30fb2701079a3464993b41 (patch) | |
| tree | a81e0160e2bfe3649c4ed3c87a20db2e29a05dda /pkgs/applications/video/mpv | |
| parent | 3e1a3aa9392fd2be39717eb1ea2a08253d1ba3fd (diff) | |
| parent | b97cda7d44aa78fe915df7b0c18e3d6ed9edd157 (diff) | |
Merge pull request #201367 from SuperSandro2000/mpv-0-35-0
mpv-unwrapped: 0.34.1 -> 0.35.0
Diffstat (limited to 'pkgs/applications/video/mpv')
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 01a2d973bf3d..05ec95d006bd 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -40,7 +40,7 @@ , vulkanSupport ? stdenv.isLinux , libplacebo - , shaderc + , shaderc # instead of spirv-cross , vulkan-headers , vulkan-loader @@ -55,11 +55,13 @@ , cacaSupport ? true, libcaca , cmsSupport ? true, lcms2 , dvdnavSupport ? stdenv.isLinux, libdvdnav +, dvbinSupport ? stdenv.isLinux , jackaudioSupport ? false, libjack2 , javascriptSupport ? true, mujs , libpngSupport ? true, libpng , openalSupport ? true, openalSoft , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, pipewireSupport ? stdenv.isLinux, pipewire , rubberbandSupport ? true, rubberband , screenSaverSupport ? true, libXScrnSaver , sdl2Support ? true, SDL2 @@ -75,14 +77,12 @@ , zimgSupport ? true, zimg }: -with lib; - let luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); in stdenv.mkDerivation rec { pname = "mpv"; - version = "0.34.1"; + version = "0.35.0"; outputs = [ "out" "dev" "man" ]; @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; - sha256 = "12qxwm1ww5vhjddl8yvj1xa0n1fi9z3lmzwhaiday2v59ca0qgsk"; + sha256 = "sha256-U3NDSxlX4/WkoHFkOvpcwPMwfwTnSpCw0QI5yLMK08o="; }; postPatch = '' - patchShebangs ./TOOLS/ + patchShebangs version.* ./TOOLS/ ''; NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext " @@ -119,13 +119,13 @@ in stdenv.mkDerivation rec { (lib.enableFeature sixelSupport "sixel") (lib.enableFeature vaapiSupport "vaapi") (lib.enableFeature waylandSupport "wayland") - (lib.enableFeature stdenv.isLinux "dvbin") + (lib.enableFeature dvbinSupport "dvbin") ] # Disable whilst Swift isn't supported ++ lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; nativeBuildInputs = [ addOpenGLRunpath - docutils + docutils # for rst2man perl pkg-config python3 @@ -154,6 +154,7 @@ in stdenv.mkDerivation rec { ++ lib.optionals javascriptSupport [ mujs ] ++ lib.optionals libpngSupport [ libpng ] ++ lib.optionals openalSupport [ openalSoft ] + ++ lib.optionals pipewireSupport [ pipewire ] ++ lib.optionals pulseSupport [ libpulseaudio ] ++ lib.optionals rubberbandSupport [ rubberband ] ++ lib.optionals screenSaverSupport [ libXScrnSaver ] |