From 8348a755709468691f1981bf6d5f121c45d54a15 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 23 Jul 2023 14:37:45 -0700 Subject: [PATCH] =?UTF-8?q?mpv:=200.35.1=20=E2=86=92=200.36.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/applications/video/mpv/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index b93d7d6606c4..057b9874162a 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -97,7 +97,7 @@ let else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "mpv"; - version = "0.35.1"; + version = "0.36.0"; outputs = [ "out" "dev" "man" ]; @@ -105,15 +105,16 @@ in stdenv'.mkDerivation (finalAttrs: { owner = "mpv-player"; repo = "mpv"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM="; + hash = "sha256-82moFbWvfc1awXih0d0D+dHqYbIoGNZ77RmafQ80IOY="; }; patches = [ + # Revert "meson: use the new build_options method" to avoid a + # cycle between the out and dev outputs. (fetchpatch { - # fixes EDL error on youtube DASH streams https://github.com/mpv-player/mpv/issues/11392 - # to be removed on next release - url = "https://github.com/mpv-player/mpv/commit/94c189dae76ba280d9883b16346c3dfb9720687e.patch"; - sha256 = "sha256-GeAltLAwkOKk82YfXYSrkNEX08uPauh7+kVbBGPWeT8="; + url = "https://github.com/mpv-player/mpv/commit/3c1686488b48bd2760e9b19f42e7d3be1363d00a.patch"; + hash = "sha256-eYXfX8Y08q4Bl41VHBpwbxYRMZgm/iziXeK6AOp8O6I="; + revert = true; }) ];