Move dev/libs/telepathy-* to a subdir

svn path=/nixpkgs/trunk/; revision=33079

pkgs/development/libraries/telepathy/farsight/default.nix

@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, telepathy_glib, farsight2, gstPluginsBase, dbus_glib
+, pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }:
+
+stdenv.mkDerivation rec {
+  name = "telepathy-farsight-0.0.19";
+
+  src = fetchurl {
+    url = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${name}.tar.gz";
+    sha256 = "0sajy2w109zc6assqby3cfqr7cckwhfsngkhjczz67grb6rbi29c";
+  };
+
+  buildInputs = [ gstPluginsBase gst_python pygobject ];
+
+  propagatedBuildInputs = [ dbus_glib farsight2 telepathy_glib gstreamer ];
+  buildNativeInputs = [ pkgconfig python libxslt];
+}

pkgs/development/libraries/telepathy/glib/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }:
+
+stdenv.mkDerivation rec {
+  name = "telepathy-glib-0.17.5";
+
+  src = fetchurl {
+    url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
+    sha256 = "13gylgwgjp29zakzj5kb4h0j5zh30dsl8ch7hp3dp4nmy4vdj6h1";
+  };
+
+  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

@@ -0,0 +1,14 @@
+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-glib-1 >= 0.82, glib-2.0 >= 2.24, gobject-2.0 >= 2.24, gio-2.0 >= 2.24
++Requires: pkg-config >= 0.21 dbus-glib-1 >= 0.82, glib-2.0 >= 2.24, gobject-2.0 >= 2.24, gio-2.0 >= 2.24
+ Libs: -L${libdir} -ltelepathy-glib
+ Cflags: -I${includedir}/telepathy-1.0

pkgs/development/libraries/telepathy/qt/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib
+, telepathy_farsight, telepathy_glib }:
+
+stdenv.mkDerivation rec {
+  name = "telepathy-qt-0.9.0";
+
+  src = fetchurl {
+    url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
+    sha256 = "0v3hnvzm3k2z99rc1znxgriqvf1n7wyjdzzsld0czhbmrz9fhang";
+  };
+
+  buildNativeInputs = [ cmake pkgconfig python libxslt ];
+  propagatedBuildInputs = [ qt4 dbus_glib telepathy_farsight telepathy_glib ];
+
+  patches = [ ./missing-include.patch ];
+
+  preBuild = ''
+    NIX_CFLAGS_COMPILE+=" `pkg-config --cflags farsight2-0.10 dbus-glib-1`"
+    '';
+}

pkgs/development/libraries/telepathy/qt/missing-include.patch

@@ -0,0 +1,11 @@
+diff --git a/TelepathyQt/Farsight/CMakeLists.txt b/TelepathyQt/Farsight/CMakeLists.txt
+index 89ec354..376f3cc 100644
+--- a/TelepathyQt/Farsight/CMakeLists.txt
++++ b/TelepathyQt/Farsight/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ if(FARSIGHT_COMPONENTS_FOUND)
+     include_directories(${TELEPATHY_FARSIGHT_INCLUDE_DIR}
++                        ${TELEPATHY_GLIB_INCLUDE_DIR}
+                         ${GSTREAMER_INCLUDE_DIR}
+                         ${GLIB2_INCLUDE_DIR}
+                         ${LIBXML2_INCLUDE_DIR}