summary refs log tree commit diff
path: root/pkgs/applications/video/mpv/default.nix
diff options
context:
space:
mode:
authorAnders Kaseorg <andersk@mit.edu>2023-07-23 14:37:45 -0700
committerAnders Kaseorg <andersk@mit.edu>2023-08-07 13:44:21 -0700
commit8348a755709468691f1981bf6d5f121c45d54a15 (patch)
tree07c9d4843905a5629ff22b9b43c49158f3f18db5 /pkgs/applications/video/mpv/default.nix
parent5a8e9243812ba528000995b294292d3b5e120947 (diff)
downloadnixpkgs-8348a755709468691f1981bf6d5f121c45d54a15.tar
nixpkgs-8348a755709468691f1981bf6d5f121c45d54a15.tar.gz
nixpkgs-8348a755709468691f1981bf6d5f121c45d54a15.tar.bz2
nixpkgs-8348a755709468691f1981bf6d5f121c45d54a15.tar.lz
nixpkgs-8348a755709468691f1981bf6d5f121c45d54a15.tar.xz
nixpkgs-8348a755709468691f1981bf6d5f121c45d54a15.tar.zst
nixpkgs-8348a755709468691f1981bf6d5f121c45d54a15.zip
mpv: 0.35.1 → 0.36.0
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Diffstat (limited to 'pkgs/applications/video/mpv/default.nix')
-rw-r--r--pkgs/applications/video/mpv/default.nix13
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index b93d7d6606c..057b9874162 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;
     })
   ];