diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-09 18:41:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-09 18:41:27 +0000 |
| commit | fcbe48c79793e614092ba278e05d5594995a88e3 (patch) | |
| tree | 91c9cc085dbd2354fc4bb59c9b3e6a1a00313639 /pkgs/applications/video | |
| parent | 8ae8602bf7529fddeab29867329c21af96600a68 (diff) | |
| parent | 9d358f1f7cb833d60dacf8b52a516ec2a753c533 (diff) | |
| download | nixlib-fcbe48c79793e614092ba278e05d5594995a88e3.tar nixlib-fcbe48c79793e614092ba278e05d5594995a88e3.tar.gz nixlib-fcbe48c79793e614092ba278e05d5594995a88e3.tar.bz2 nixlib-fcbe48c79793e614092ba278e05d5594995a88e3.tar.lz nixlib-fcbe48c79793e614092ba278e05d5594995a88e3.tar.xz nixlib-fcbe48c79793e614092ba278e05d5594995a88e3.tar.zst nixlib-fcbe48c79793e614092ba278e05d5594995a88e3.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 2b9605aa3c26..02135fe52ed1 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchFromGitHub +{ config, stdenv, fetchFromGitHub, fetchpatch , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which , ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null @@ -104,6 +104,14 @@ in stdenv.mkDerivation rec { sha256 = "sha256-3l32qQBpvWVjbLp5CZtO039oDQeH7C/cNAKtJxrzlRk="; }; + patches = [ + # To make mpv build with libplacebo 3.104.0: + (fetchpatch { # vo_gpu: placebo: update for upstream API changes + url = "https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch"; + sha256 = "1yfc6220ak5kc5kf7zklmsa944nr9q0qaa27l507pgrmvcyiyzrx"; + }) + ]; + postPatch = '' patchShebangs ./TOOLS/ ''; |