alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/video/MPlayer/default.nix
View file

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

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

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