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

Merge pull request #104844 from marsam/fix-mpv-darwin

Browse source 
mpv: fix build on darwin
This commit is contained in:
Martin Weinelt 2020-11-25 03:50:21 +01:00 committed by GitHub
commit fa8faa1c31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ config, stdenv, fetchurl, fetchFromGitHub, fetchpatch
{ config, stdenv, fetchFromGitHub
, addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which
, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs
, nv-codec-headers, lua, libuchardet, libiconv ? null
@ -185,14 +185,6 @@ in stdenv.mkDerivation rec {
python3 TOOLS/osxbundle.py -s build/mpv
'';
patches = stdenv.lib.optionals stdenv.isDarwin [
# Fix cocoa backend. Remove with the next release
(fetchpatch {
url = "https://github.com/mpv-player/mpv/commit/188169854313b99d01da8f69fe129f0a487eb7c4.patch";
sha256 = "062sz4666prb2wg1rn5q8brqkzlq6lxn8sxic78a8lb0125c01f7";
})
];
postInstall = ''
# Use a standard font
mkdir -p $out/share/mpv