diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/video/mplayer/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/video/mplayer/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/applications/video/mplayer/default.nix b/nixpkgs/pkgs/applications/video/mplayer/default.nix index 4e245b70d4f8..bdcd3fbc8fd3 100644 --- a/nixpkgs/pkgs/applications/video/mplayer/default.nix +++ b/nixpkgs/pkgs/applications/video/mplayer/default.nix @@ -1,11 +1,11 @@ -{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg_3 +{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null , x11Support ? true, libX11 ? null, libXext ? null, libGLU, libGL ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null -, alsaSupport ? stdenv.isLinux, alsaLib ? null +, alsaSupport ? stdenv.isLinux, alsa-lib ? null , screenSaverSupport ? true, libXScrnSaver ? null , vdpauSupport ? false, libvdpau ? null , cddaSupport ? !stdenv.isDarwin, cdparanoia ? null @@ -36,7 +36,7 @@ assert fribidiSupport -> (fribidi != null); assert x11Support -> (libX11 != null && libXext != null && libGLU != null && libGL != null); assert xineramaSupport -> (libXinerama != null && x11Support); assert xvSupport -> (libXv != null && x11Support); -assert alsaSupport -> alsaLib != null; +assert alsaSupport -> alsa-lib != null; assert screenSaverSupport -> libXScrnSaver != null; assert vdpauSupport -> libvdpau != null; assert cddaSupport -> cdparanoia != null; @@ -106,15 +106,17 @@ stdenv.mkDerivation rec { rm -rf ffmpeg ''; + patches = [ ./svn-r38199-ffmpeg44fix.patch ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config yasm ]; buildInputs = with lib; - [ freetype ffmpeg_3 ] + [ freetype ffmpeg ] ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi ++ optionals x11Support [ libX11 libXext libGLU libGL ] - ++ optional alsaSupport alsaLib + ++ optional alsaSupport alsa-lib ++ optional xvSupport libXv ++ optional theoraSupport libtheora ++ optional cacaSupport libcaca |