public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xine-lib: added pkg-config

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10065
This commit is contained in:
Yury G. Kudryashov
2008-01-03 17:13:33 +00:00
parent c9982118fc
commit e17a21b820
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/xine-lib/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, xineramaSupport ? true , xineramaSupport ? true
, encryptedDVDSupport ? true , encryptedDVDSupport ? true
, alsaSupport ? true , alsaSupport ? true
, stdenv, fetchurl, zlib, x11 , stdenv, fetchurl, zlib, x11, pkgconfig
, libXv ? null, libXinerama ? null, libdvdcss ? null, alsaLib ? null , libXv ? null, libXinerama ? null, libdvdcss ? null, alsaLib ? null
}: }:
@@ -19,7 +19,7 @@ assert alsaSupport -> alsaLib != null;
sha256 = "03iwhgsf9kj0x5b4fgv7lzc1vj3frk4afh2idgrqskvixjyi37vc"; sha256 = "03iwhgsf9kj0x5b4fgv7lzc1vj3frk4afh2idgrqskvixjyi37vc";
}; };
buildInputs = [ buildInputs = [
x11 x11 pkgconfig
(if xvideoSupport then libXv else null) (if xvideoSupport then libXv else null)
(if xineramaSupport then libXinerama else null) (if xineramaSupport then libXinerama else null)
(if alsaSupport then alsaLib else null) (if alsaSupport then alsaLib else null)
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -2407,7 +2407,7 @@ rec {
}; };
xineLib = import ../development/libraries/xine-lib { 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; inherit (xlibs) libXv libXinerama;
}; };