public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix telepathy-qt compilation

Browse Source 
svn path=/nixpkgs/trunk/; revision=33053
This commit is contained in:
Yury G. Kudryashov 2012-03-13 23:15:06 +00:00
parent 12cfef03f8
commit 4981d6d2e7
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/telepathy-qt/default.nix
View File

@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
patches = [ ./missing-include.patch ]; patches = [ ./missing-include.patch ];
preBuild = '' preBuild = ''
NIX_CFLAGS_COMPILE+=" `pkg-config --cflags farsight2-0.10`" NIX_CFLAGS_COMPILE+=" `pkg-config --cflags farsight2-0.10 dbus-glib-1`"
''; '';
} }

15
pkgs/development/libraries/telepathy-qt/missing-include.patch
View File

@ -2,23 +2,10 @@ diff --git a/TelepathyQt/Farsight/CMakeLists.txt b/TelepathyQt/Farsight/CMakeLis
index 89ec354..376f3cc 100644 index 89ec354..376f3cc 100644
--- a/TelepathyQt/Farsight/CMakeLists.txt --- a/TelepathyQt/Farsight/CMakeLists.txt
+++ b/TelepathyQt/Farsight/CMakeLists.txt +++ b/TelepathyQt/Farsight/CMakeLists.txt
@@ -1,5 +1,7 @@ @@ -1,5 +1,6 @@
if(FARSIGHT_COMPONENTS_FOUND) if(FARSIGHT_COMPONENTS_FOUND)
include_directories(${TELEPATHY_FARSIGHT_INCLUDE_DIR} include_directories(${TELEPATHY_FARSIGHT_INCLUDE_DIR}
+ ${TELEPATHY_GLIB_INCLUDE_DIR} + ${TELEPATHY_GLIB_INCLUDE_DIR}
+ ${DBUS_GLIB_INCLUDE_DIRS}
${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_INCLUDE_DIR}
${GLIB2_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR}
${LIBXML2_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)