From 06a60d35d5ae37ee4aef8c7147405c38e0463841 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 14 Aug 2007 12:58:09 +0000 Subject: [PATCH] * xine-ui now needs pkgconfig. svn path=/nixpkgs/trunk/; revision=9119 --- pkgs/applications/video/xine-ui/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 46ec878c46c..ce67a3d5083 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, xineLib, libpng}: +{stdenv, fetchurl, pkgconfig, x11, xineLib, libpng}: stdenv.mkDerivation { name = "xine-ui-0.99.5"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "07jywadk6fhk3wn1j9m0cfa0zy0i17kz0nyyxwa3shvhznfals0k"; }; buildInputs = [ - x11 xineLib libpng + pkgconfig x11 xineLib libpng (if xineLib.xineramaSupport then xineLib.libXinerama else null) ]; configureFlags = "--without-readline --disable-xft"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52687cb4267..171bab66c24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3409,7 +3409,7 @@ rec { }; xineUI = import ../applications/video/xine-ui { - inherit fetchurl stdenv x11 xineLib libpng; + inherit fetchurl stdenv pkgconfig x11 xineLib libpng; }; xmms = import ../applications/audio/xmms {