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

Add vanilla pkg-config

Browse Source 
Some packages (e.g., telepathy) rely on the upstream way to handle
Requires.private in pkg-config.

svn path=/nixpkgs/trunk/; revision=34492
This commit is contained in:
Yury G. Kudryashov 2012-06-13 07:09:10 +00:00
parent 7ad2658f83
commit c6d9ead047
2 changed files with 3 additions and 2 deletions
pkgs
development/tools/misc/pkgconfig
default.nix
top-level
all-packages.nix

4
pkgs/development/tools/misc/pkgconfig/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, automake}: {stdenv, fetchurl, automake, vanilla ? false}:
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "pkg-config-0.23"; name = "pkg-config-0.23";
@ -10,7 +10,7 @@ stdenv.mkDerivation (rec {
sha256 = "0lrvk17724mc2nzpaa0vwybarrl50r7qdnr4h6jijm50srrf1808"; sha256 = "0lrvk17724mc2nzpaa0vwybarrl50r7qdnr4h6jijm50srrf1808";
}; };
patches = [ patches = if vanilla then [] else [
# Process Requires.private properly, see # Process Requires.private properly, see
# http://bugs.freedesktop.org/show_bug.cgi?id=4738. # http://bugs.freedesktop.org/show_bug.cgi?id=4738.
./requires-private.patch ./requires-private.patch

1
pkgs/top-level/all-packages.nix
View File

@ -3050,6 +3050,7 @@ let
buildNativeInput after the renaming. buildNativeInput after the renaming.
*/ */
pkgconfig = forceBuildDrv (callPackage ../development/tools/misc/pkgconfig { }); pkgconfig = forceBuildDrv (callPackage ../development/tools/misc/pkgconfig { });
pkgconfigUpstream = pkgconfig.override { vanilla = true; };
premake = callPackage ../development/tools/misc/premake { }; premake = callPackage ../development/tools/misc/premake { };