public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding yasm and lame support to mplayer

Browse Source 
svn path=/nixpkgs/trunk/; revision=21972
This commit is contained in:
Lluís Batlle i Rossell 2010-05-25 18:39:29 +00:00
parent adc9f57c71
commit f7bd2a829e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/video/MPlayer/default.nix
View File

@ -8,7 +8,8 @@
, jackaudioSupport ? false, jackaudio ? null , jackaudioSupport ? false, jackaudio ? null
, x264Support ? false, x264 ? null , x264Support ? false, x264 ? null
, xvidSupport ? false, xvidcore ? null , xvidSupport ? false, xvidcore ? null
, mesa, pkgconfig, unzip , lameSupport ? true, lame ? null
, mesa, pkgconfig, unzip, yasm
}: }:
assert alsaSupport -> alsa != null; assert alsaSupport -> alsa != null;
@ -53,7 +54,7 @@ stdenv.mkDerivation {
}; };
buildInputs = buildInputs =
[ x11 libXv freetype zlib mesa pkgconfig ] [ x11 libXv freetype zlib mesa pkgconfig yasm ]
++ stdenv.lib.optional alsaSupport alsa ++ stdenv.lib.optional alsaSupport alsa
++ stdenv.lib.optional xvSupport libXv ++ stdenv.lib.optional xvSupport libXv
++ stdenv.lib.optional theoraSupport libtheora ++ stdenv.lib.optional theoraSupport libtheora
@ -65,7 +66,8 @@ stdenv.mkDerivation {
++ stdenv.lib.optional jackaudioSupport jackaudio ++ stdenv.lib.optional jackaudioSupport jackaudio
++ stdenv.lib.optionals amrSupport [ amrnb amrwb ] ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ]
++ stdenv.lib.optional x264Support x264 ++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore; ++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional lameSupport lame;
configureFlags = '' configureFlags = ''
${if cacaSupport then "--enable-caca" else "--disable-caca"} ${if cacaSupport then "--enable-caca" else "--disable-caca"}

2
pkgs/top-level/all-packages.nix
View File

@ -8189,7 +8189,7 @@ let
MPlayer = import ../applications/video/MPlayer { MPlayer = import ../applications/video/MPlayer {
inherit fetchurl stdenv freetype fontconfig x11 zlib libtheora libcaca libdvdnav inherit fetchurl stdenv freetype fontconfig x11 zlib libtheora libcaca libdvdnav
cdparanoia mesa pkgconfig unzip amrnb amrwb jackaudio x264 xvidcore; cdparanoia mesa pkgconfig unzip amrnb amrwb jackaudio x264 xvidcore lame yasm;
inherit (xlibs) libX11 libXv libXinerama libXrandr; inherit (xlibs) libX11 libXv libXinerama libXrandr;
alsaSupport = true; alsaSupport = true;
alsa = alsaLib; alsa = alsaLib;