From e17a21b8202dffa6fd5a34792a3f9c73b1b80c7a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 3 Jan 2008 17:13:33 +0000 Subject: [PATCH] xine-lib: added pkg-config svn path=/nixpkgs/branches/stdenv-updates/; revision=10065 --- pkgs/development/libraries/xine-lib/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 51592f61b1a..0af3732cbae 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -2,7 +2,7 @@ , xineramaSupport ? true , encryptedDVDSupport ? true , alsaSupport ? true -, stdenv, fetchurl, zlib, x11 +, stdenv, fetchurl, zlib, x11, pkgconfig , libXv ? null, libXinerama ? null, libdvdcss ? null, alsaLib ? null }: @@ -19,7 +19,7 @@ assert alsaSupport -> alsaLib != null; sha256 = "03iwhgsf9kj0x5b4fgv7lzc1vj3frk4afh2idgrqskvixjyi37vc"; }; buildInputs = [ - x11 + x11 pkgconfig (if xvideoSupport then libXv else null) (if xineramaSupport then libXinerama else null) (if alsaSupport then alsaLib else null) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c6aaf240e4..edb774fd96b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2407,7 +2407,7 @@ rec { }; xineLib = import ../development/libraries/xine-lib { - inherit fetchurl stdenv zlib x11 libdvdcss alsaLib; + inherit fetchurl stdenv zlib x11 libdvdcss alsaLib pkgconfig; inherit (xlibs) libXv libXinerama; };