diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-10 18:21:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-10 18:21:38 +0200 |
commit | 1463480edbf6757140b3764dcec2fa720978add6 (patch) | |
tree | e92eb103ed0722726c6386628fa2d64f4e60743c /pkgs/applications | |
parent | 1d682d5314e7999a2a347fe66af5dca39166551c (diff) | |
parent | d691c8170ae2a8ef73c40f6187e7181015f8cdca (diff) | |
download | nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.gz nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.bz2 nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.lz nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.xz nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.zst nixlib-1463480edbf6757140b3764dcec2fa720978add6.zip |
Merge pull request #40289 from yegortimoshenko/mpv-bump
mpv: 0.27.2 -> 0.28.2
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index aa17cf183e34..58628aa1f8e8 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper -, docutils, perl, pkgconfig, python3, which, ffmpeg +, docutils, perl, pkgconfig, python3, which, ffmpeg_4 , freefont_ttf, freetype, libass, libpthreadstubs , lua, luasocket, libuchardet, libiconv ? null, darwin @@ -83,22 +83,15 @@ let }; in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.27.2"; + version = "0.28.2"; src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; - sha256 = "1ivyyqajkxq5c1zxp0dm7pljvianhgvwl3dbghgpzyrch59k5wnr"; + sha256 = "0bldxhqjz7z9fgvx4k40l49awpay17fscp8ypswb459yicy8npmg"; }; - patches = [ - (fetchpatch { - url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch"; - sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb"; - }) - ]; - postPatch = '' patchShebangs ./TOOLS/ ''; @@ -131,7 +124,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - ffmpeg freetype libass libpthreadstubs + ffmpeg_4 freetype libass libpthreadstubs lua luasocket libuchardet ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv |