3
0
Fork 0
forked from mirrors/nixpkgs

Adding pkgconfig to MPlayer, as now it uses it for finding some libs as theora.

svn path=/nixpkgs/trunk/; revision=15629
This commit is contained in:
Lluís Batlle i Rossell 2009-05-17 20:34:12 +00:00
parent 291260a325
commit 5d72346338
2 changed files with 3 additions and 3 deletions

View file

@ -4,7 +4,7 @@
, alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null , alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null
, libXinerama ? null, libXrandr ? null, libdvdnav ? null , libXinerama ? null, libXrandr ? null, libdvdnav ? null
, cdparanoia ? null, cddaSupport ? true , cdparanoia ? null, cddaSupport ? true
, mesa , mesa, pkgconfig
}: }:
assert alsaSupport -> alsa != null; assert alsaSupport -> alsa != null;
@ -37,7 +37,7 @@ stdenv.mkDerivation {
}; };
buildInputs = buildInputs =
[x11 libXv freetype zlib mesa] [x11 libXv freetype zlib mesa pkgconfig]
++ 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

View file

@ -6503,7 +6503,7 @@ let
MPlayer = import ../applications/video/MPlayer { MPlayer = import ../applications/video/MPlayer {
inherit fetchurl stdenv freetype x11 zlib libtheora libcaca freefont_ttf libdvdnav inherit fetchurl stdenv freetype x11 zlib libtheora libcaca freefont_ttf libdvdnav
cdparanoia mesa; cdparanoia mesa pkgconfig;
inherit (xlibs) libX11 libXv libXinerama libXrandr; inherit (xlibs) libX11 libXv libXinerama libXrandr;
alsaSupport = true; alsaSupport = true;
alsa = alsaLib; alsa = alsaLib;