Skip to content

Commit

Permalink
Merge pull request #104844 from marsam/fix-mpv-darwin
Browse files Browse the repository at this point in the history
mpv: fix build on darwin
  • Loading branch information
mweinelt authored Nov 25, 2020
2 parents 731c548 + 7a4b523 commit fa8faa1
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions pkgs/applications/video/mpv/default.nix
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit fa8faa1

Please sign in to comment.