diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2023-08-08 04:48:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-08 04:48:46 +0200 |
commit | f0e6b65ce699481bed624c64363405f7b4303f83 (patch) | |
tree | 0826a7a83e03c9a679044367d8b73c98c650dbd3 /pkgs/applications/video | |
parent | 3a030589d6cc9aed6e3a7174c85434446ff511b8 (diff) | |
parent | 8348a755709468691f1981bf6d5f121c45d54a15 (diff) |
Merge pull request #245104 from andersk/mpv
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index b93d7d6606c49..057b9874162ad 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; }) ]; |