diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix index 9056febd7d68..e8b120b93316 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix @@ -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 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf"; }; - buildNativeInputs = [pkgconfig libxslt python]; + buildNativeInputs = [pkgconfigUpstream libxslt python]; buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip]; meta = { diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index dc5675c1b2cc..3c100282aa46 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup -, libuuid, gnutls, sqlite, pkgconfig }: +, libuuid, gnutls, sqlite, pkgconfigUpstream }: stdenv.mkDerivation rec { pname = "telepathy-salut"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls sqlite ]; - buildNativeInputs = [ libxslt pkgconfig ]; + buildNativeInputs = [ libxslt pkgconfigUpstream ]; configureFlags = "--disable-avahi-tests"; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 22a6aef5c3a7..b31338a65951 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -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; }; diff --git a/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch b/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch deleted file mode 100644 index bba92d408a08..000000000000 --- a/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch +++ /dev/null @@ -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