diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-19 10:27:13 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-19 10:27:13 +0100 |
| commit | 4a2340ff6bd0474d9a3e933f28b8568c59019b82 (patch) | |
| tree | 235f2b7adf6b6f25c416c0d3223ce4f3bfed2319 /pkgs/applications | |
| parent | b4551924b183f0f0a34868f76f52ae0bff5d041c (diff) | |
| parent | 69345ec37b8da3de94d4262b81bfa08000d35427 (diff) | |
| download | nixlib-4a2340ff6bd0474d9a3e933f28b8568c59019b82.tar nixlib-4a2340ff6bd0474d9a3e933f28b8568c59019b82.tar.gz nixlib-4a2340ff6bd0474d9a3e933f28b8568c59019b82.tar.bz2 nixlib-4a2340ff6bd0474d9a3e933f28b8568c59019b82.tar.lz nixlib-4a2340ff6bd0474d9a3e933f28b8568c59019b82.tar.xz nixlib-4a2340ff6bd0474d9a3e933f28b8568c59019b82.tar.zst nixlib-4a2340ff6bd0474d9a3e933f28b8568c59019b82.zip | |
Merge branch 'staging'
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 680cad1ec252..7aaa1b65fc45 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, makeWrapper +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg , freefont_ttf, freetype, libass, libpthreadstubs , lua, lua5_sockets, libuchardet, libiconv ? null, darwin @@ -90,7 +90,14 @@ in stdenv.mkDerivation rec { sha256 = "0746kmsg69675y5c70vn8imcr9d1zpjz97f27xr1vx00yjpd518v"; }; - patchPhase = '' + patches = [ + (fetchpatch { + url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch"; + sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb"; + }) + ]; + + postPatch = '' patchShebangs ./TOOLS/ ''; |