From 941d15af7ab1a0d86b59ded7b02e92d7a704d9bb Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 13 Mar 2012 19:06:54 +0000
Subject: [PATCH] telepathy-gabble-0.15.4

svn path=/nixpkgs/trunk/; revision=33044
---
 .../libraries/telepathy-gabble/default.nix         | 14 ++++++++------
 pkgs/top-level/all-packages.nix                    |  4 +++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/telepathy-gabble/default.nix b/pkgs/development/libraries/telepathy-gabble/default.nix
index c188f271742c..154057b9377e 100644
--- a/pkgs/development/libraries/telepathy-gabble/default.nix
+++ b/pkgs/development/libraries/telepathy-gabble/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, loudmouth }:
+{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib
+, sqlite, libsoup, libnice, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-gabble-0.7.2";
+  name = "telepathy-gabble-0.15.4";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
-    sha256 = "0r1j475a5s2a4f10hybmavf4kf6nrnjnv091dpic5nl2asdilb7i";
+    sha256 = "0rgqxsdcxds0ljcc01f9ifav26y80p4my37wqzkicr9hmv54h98s";
   };
 
-  propagatedBuildInputs = [telepathy_glib loudmouth];
-  
-  buildInputs = [pkgconfig libxslt];
+  buildNativeInputs = [pkgconfig libxslt];
+  buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ];
+
+  configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt";
   
   meta = {
     homepage = http://telepathy.freedesktop.org;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50f83bfc7daa..910c2c49e5ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4702,7 +4702,9 @@ let
 
   tecla = callPackage ../development/libraries/tecla { };
 
-  telepathy_gabble = callPackage ../development/libraries/telepathy-gabble { };
+  telepathy_gabble = callPackage ../development/libraries/telepathy-gabble {
+    inherit (pkgs.gnome) libsoup;
+  };
 
   telepathy_glib = callPackage ../development/libraries/telepathy-glib { };