diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 13:29:04 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 13:29:04 -0400 |
| commit | f40aa17933bc07d7913fd705b5f8ce50aab86782 (patch) | |
| tree | e34c79e6c3a09dc63011b44d877345f1a6b3bc78 /pkgs/applications/video | |
| parent | d1c4260859efeef4347d007ef8ce9bea5703cd0f (diff) | |
| parent | 4ae207aea0164caee9c39b24177692ab4ef4dab4 (diff) | |
| download | nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.gz nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.bz2 nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.lz nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.xz nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.zst nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/video')
| -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 |