diff --git a/pkgs/development/libraries/telepathy-qt/default.nix b/pkgs/development/libraries/telepathy-qt/default.nix index bf7acaef76a5..0f5916e7ade6 100644 --- a/pkgs/development/libraries/telepathy-qt/default.nix +++ b/pkgs/development/libraries/telepathy-qt/default.nix @@ -1,10 +1,20 @@ -{stdenv, fetchurl, cmake, qt4}: +{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib +, telepathy_farsight, telepathy_glib }: + +stdenv.mkDerivation rec { + name = "telepathy-qt-0.9.0"; -stdenv.mkDerivation { - name = "telepathy-qt-0.14.1"; src = fetchurl { - url = mirror://sourceforge/tapioca-voip/telepathy-qt-0.14.1.tar.gz; - md5 = "476e3fbd68b3eaf5354559be7de99333"; + url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; + sha256 = "0v3hnvzm3k2z99rc1znxgriqvf1n7wyjdzzsld0czhbmrz9fhang"; }; - buildInputs = [ cmake qt4 ]; + + 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`" + ''; } diff --git a/pkgs/development/libraries/telepathy-qt/missing-include.patch b/pkgs/development/libraries/telepathy-qt/missing-include.patch new file mode 100644 index 000000000000..557a62160333 --- /dev/null +++ b/pkgs/development/libraries/telepathy-qt/missing-include.patch @@ -0,0 +1,24 @@ +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,7 @@ + if(FARSIGHT_COMPONENTS_FOUND) + include_directories(${TELEPATHY_FARSIGHT_INCLUDE_DIR} ++ ${TELEPATHY_GLIB_INCLUDE_DIR} ++ ${DBUS_GLIB_INCLUDE_DIRS} + ${GSTREAMER_INCLUDE_DIR} + ${GLIB2_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} +diff --git a/tests/lib/glib-helpers/CMakeLists.txt b/tests/lib/glib-helpers/CMakeLists.txt +index bc75234..31cc833 100644 +--- a/tests/lib/glib-helpers/CMakeLists.txt ++++ b/tests/lib/glib-helpers/CMakeLists.txt +@@ -3,6 +3,7 @@ include_directories( + ${TELEPATHY_GLIB_INCLUDE_DIR} + ${GLIB2_INCLUDE_DIR} + ${GOBJECT_INCLUDE_DIR} ++ ${DBUS_GLIB_INCLUDE_DIRS} + ${DBUS_INCLUDE_DIR}) + + add_definitions(-DQT_NO_KEYWORDS)