diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-06-13 07:09:10 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-06-13 07:09:10 +0000 |
| commit | c6d9ead04755d35decd4051c2667ca9f9a440f89 (patch) | |
| tree | 298485f923b702a707a33b641a7dcb7120d7ae05 | |
| parent | 7ad2658f83735540976abb3d8ce43e3f89952a22 (diff) | |
| download | nixlib-c6d9ead04755d35decd4051c2667ca9f9a440f89.tar nixlib-c6d9ead04755d35decd4051c2667ca9f9a440f89.tar.gz nixlib-c6d9ead04755d35decd4051c2667ca9f9a440f89.tar.bz2 nixlib-c6d9ead04755d35decd4051c2667ca9f9a440f89.tar.lz nixlib-c6d9ead04755d35decd4051c2667ca9f9a440f89.tar.xz nixlib-c6d9ead04755d35decd4051c2667ca9f9a440f89.tar.zst nixlib-c6d9ead04755d35decd4051c2667ca9f9a440f89.zip | |
Add vanilla pkg-config
Some packages (e.g., telepathy) rely on the upstream way to handle Requires.private in pkg-config. svn path=/nixpkgs/trunk/; revision=34492
| -rw-r--r-- | pkgs/development/tools/misc/pkgconfig/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index f323a7d7dbc1..49b2cbfe66e4 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake}: +{stdenv, fetchurl, automake, vanilla ? false}: stdenv.mkDerivation (rec { name = "pkg-config-0.23"; @@ -10,7 +10,7 @@ stdenv.mkDerivation (rec { sha256 = "0lrvk17724mc2nzpaa0vwybarrl50r7qdnr4h6jijm50srrf1808"; }; - patches = [ + patches = if vanilla then [] else [ # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738. ./requires-private.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b98456108b48..12dd024798dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3050,6 +3050,7 @@ let buildNativeInput after the renaming. */ pkgconfig = forceBuildDrv (callPackage ../development/tools/misc/pkgconfig { }); + pkgconfigUpstream = pkgconfig.override { vanilla = true; }; premake = callPackage ../development/tools/misc/premake { }; |