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

telepathy-glib-0.18.1 (0.19.x requires glib-2.32.x)

Browse Source 
Drop pkg-config patch, pass pkgconfigUpstream to rakia and salut.

svn path=/nixpkgs/trunk/; revision=34495
This commit is contained in:
Yury G. Kudryashov
2012-06-13 07:09:23 +00:00
parent 316222e2e1
commit 5487fbe94a
4 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/telepathy/glib/default.nix
+2 -4
View File
@@ -1,19 +1,17 @@
{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }:
stdenv.mkDerivation rec {
name = "telepathy-glib-0.17.7";
name = "telepathy-glib-0.18.1";
src = fetchurl {
url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
sha256 = "1brzw0cqawcyh7rffzbmydzbymrrsmzf8rksgamiqpwsdvcnksxz";
sha256 = "0vac5wk9rpaniqxwa50szcc5ql779ks37sy4z7fj4k73i5k2af1p";
};
propagatedBuildInputs = [dbus_glib glib python];
buildInputs = [pkgconfig libxslt];
patches = [ ./fix-pkgconfig.patch ];
meta = {
homepage = http://telepathy.freedesktop.org;
};
pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch
-14
View File
@@ -1,14 +0,0 @@
Adjust telepathy-glib.pc to our version of pkg-config
diff --git a/telepathy-glib/telepathy-glib.pc.in b/telepathy-glib/telepathy-glib.pc.in
index e2ddf03..6038011 100644
--- a/telepathy-glib/telepathy-glib.pc.in
+++ b/telepathy-glib/telepathy-glib.pc.in
@@ -6,7 +6,6 @@ includedir=@includedir@
Name: Telepathy-GLib
Description: GLib utility library for the Telepathy framework
Version: @VERSION@
-Requires: pkg-config >= 0.21
-Requires.private: dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30
+Requires: pkg-config >= 0.21 dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30
Libs: -L${libdir} -ltelepathy-glib
Cflags: -I${includedir}/telepathy-1.0