ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib { stdenv, fetchurl, pkgconfigUpstream, libxslt, telepathy_glib, libxml2, dbus_glib
, python, sofia_sip }: , python, sofia_sip }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf"; sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf";
}; };
buildNativeInputs = [pkgconfig libxslt python]; buildNativeInputs = [pkgconfigUpstream libxslt python];
buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip]; buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip];
meta = { meta = {

4
pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup { stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup
, libuuid, gnutls, sqlite, pkgconfig }: , libuuid, gnutls, sqlite, pkgconfigUpstream }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "telepathy-salut"; pname = "telepathy-salut";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls
sqlite ]; sqlite ];
buildNativeInputs = [ libxslt pkgconfig ]; buildNativeInputs = [ libxslt pkgconfigUpstream ];
configureFlags = "--disable-avahi-tests"; configureFlags = "--disable-avahi-tests";

6
pkgs/development/libraries/telepathy/glib/default.nix
View File

@ -1,19 +1,17 @@
{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }: { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "telepathy-glib-0.17.7"; name = "telepathy-glib-0.18.1";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
sha256 = "1brzw0cqawcyh7rffzbmydzbymrrsmzf8rksgamiqpwsdvcnksxz"; sha256 = "0vac5wk9rpaniqxwa50szcc5ql779ks37sy4z7fj4k73i5k2af1p";
}; };
propagatedBuildInputs = [dbus_glib glib python]; propagatedBuildInputs = [dbus_glib glib python];
buildInputs = [pkgconfig libxslt]; buildInputs = [pkgconfig libxslt];
patches = [ ./fix-pkgconfig.patch ];
meta = { meta = {
homepage = http://telepathy.freedesktop.org; homepage = http://telepathy.freedesktop.org;
}; };

14
pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch
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