cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #245104 from andersk/mpv

Browse source
This commit is contained in:
Franz Pletz 2023-08-08 04:48:46 +02:00 committed by GitHub
commit f0e6b65ce6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/video/mpv/default.nix
View file

@ -97,7 +97,7 @@ let
else stdenv; else stdenv;
in stdenv'.mkDerivation (finalAttrs: { in stdenv'.mkDerivation (finalAttrs: {
pname = "mpv"; pname = "mpv";
version = "0.35.1"; version = "0.36.0";
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
@ -105,15 +105,16 @@ in stdenv'.mkDerivation (finalAttrs: {
owner = "mpv-player"; owner = "mpv-player";
repo = "mpv"; repo = "mpv";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM="; hash = "sha256-82moFbWvfc1awXih0d0D+dHqYbIoGNZ77RmafQ80IOY=";
}; };
patches = [ patches = [
# Revert "meson: use the new build_options method" to avoid a
# cycle between the out and dev outputs.
(fetchpatch { (fetchpatch {
# fixes EDL error on youtube DASH streams https://github.com/mpv-player/mpv/issues/11392 url = "https://github.com/mpv-player/mpv/commit/3c1686488b48bd2760e9b19f42e7d3be1363d00a.patch";
# to be removed on next release hash = "sha256-eYXfX8Y08q4Bl41VHBpwbxYRMZgm/iziXeK6AOp8O6I=";
url = "https://github.com/mpv-player/mpv/commit/94c189dae76ba280d9883b16346c3dfb9720687e.patch"; revert = true;
sha256 = "sha256-GeAltLAwkOKk82YfXYSrkNEX08uPauh7+kVbBGPWeT8=";
}) })
]; ];