From 5d7234633849814f168b18a5d414f8387831f4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 17 May 2009 20:34:12 +0000 Subject: [PATCH] Adding pkgconfig to MPlayer, as now it uses it for finding some libs as theora. svn path=/nixpkgs/trunk/; revision=15629 --- pkgs/applications/video/MPlayer/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index cc1306a20a58..f53cd2911378 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28b49a6e41fd..e47c8430f41a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;