diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2016-09-14 01:12:22 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2016-09-14 12:51:47 -0500 |
commit | 85f2c3ebc9608f8efe8dbbccc798fa7550ef45a6 (patch) | |
tree | 24f0bdda10cfb749d1ada8e55cf0385316233d95 /pkgs/applications/video/mplayer | |
parent | 1781e955779397e4c39d406909823841210df962 (diff) |
mplayer: fix on darwin
Diffstat (limited to 'pkgs/applications/video/mplayer')
-rw-r--r-- | pkgs/applications/video/mplayer/default.nix | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index a317e1d4fe52..43b6f4f36cf2 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, freetype, yasm +{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, yasm , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null -, alsaSupport ? true, alsaLib ? null +, alsaSupport ? stdenv.isLinux, alsaLib ? null , screenSaverSupport ? true, libXScrnSaver ? null , vdpauSupport ? false, libvdpau ? null -, cddaSupport ? true, cdparanoia ? null -, dvdnavSupport ? true, libdvdnav ? null +, cddaSupport ? !stdenv.isDarwin, cdparanoia ? null +, dvdnavSupport ? !stdenv.isDarwin, libdvdnav ? null , bluraySupport ? true, libbluray ? null , amrSupport ? false, amrnb ? null, amrwb ? null , cacaSupport ? true, libcaca ? null @@ -24,6 +24,7 @@ , libpngSupport ? true, libpng ? null , libjpegSupport ? true, libjpeg ? null , useUnfreeCodecs ? false +, darwin ? null }: assert fontconfigSupport -> (fontconfig != null); @@ -102,6 +103,13 @@ stdenv.mkDerivation rec { sed -i /^_install_strip/d configure ''; + patches = [ + (fetchpatch { + url = "https://github.com/pigoz/mplayer-svn/commit/6c6a7c2afe11c15716cdf4371fb4bf211644b7e1.patch"; + sha256 = "0abg5122kisgcc8ay3barlibrgn259igsfq3ak6na9g8j5cgviw9"; + }) + ]; + buildInputs = with stdenv.lib; [ pkgconfig freetype ] ++ optional aalibSupport aalib @@ -127,6 +135,7 @@ stdenv.mkDerivation rec { ++ optional libpngSupport libpng ++ optional libjpegSupport libjpeg ++ optional bs2bSupport libbs2b + ++ (with darwin.apple_sdk.frameworks; optionals stdenv.isDarwin [ Cocoa OpenGL ]) ; nativeBuildInputs = [ yasm ]; @@ -162,8 +171,8 @@ stdenv.mkDerivation rec { --disable-xanim --disable-ivtv --disable-xvid --disable-xvid-lavc - --enable-vidix - --enable-fbdev + ${optionalString stdenv.isLinux "--enable-vidix"} + ${optionalString stdenv.isLinux "--enable-fbdev"} --disable-ossaudio ''; |