forked from mirrors/nixpkgs
telepathy-qt-0.9.0
Notice that this is *not* downgrade. This is a new project recently renamed from telepathy-qt4 (the old telepathy-qt seems to be dead). svn path=/nixpkgs/trunk/; revision=33046
This commit is contained in:
parent
b904117beb
commit
199cc0ce51
|
@ -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 {
|
src = fetchurl {
|
||||||
url = mirror://sourceforge/tapioca-voip/telepathy-qt-0.14.1.tar.gz;
|
url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
|
||||||
md5 = "476e3fbd68b3eaf5354559be7de99333";
|
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`"
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -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)
|
Loading…
Reference in a new issue