pyrox.dev / nixpkgs
lol
fork atom

Fix telepathy-qt compilation

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

Yury G. Kudryashov 4981d6d2 12cfef03

+2 -15
unified split
+1 -1
pkgs/development/libraries/telepathy-qt/default.nix
··· 15 15 patches = [ ./missing-include.patch ]; 16 16 17 17 preBuild = '' 18 - NIX_CFLAGS_COMPILE+=" `pkg-config --cflags farsight2-0.10`" 18 + NIX_CFLAGS_COMPILE+=" `pkg-config --cflags farsight2-0.10 dbus-glib-1`" 19 19 ''; 20 20 }
+1 -14
pkgs/development/libraries/telepathy-qt/missing-include.patch
··· 2 2 index 89ec354..376f3cc 100644 3 3 --- a/TelepathyQt/Farsight/CMakeLists.txt 4 4 +++ b/TelepathyQt/Farsight/CMakeLists.txt 5 - @@ -1,5 +1,7 @@ 5 + @@ -1,5 +1,6 @@ 6 6 if(FARSIGHT_COMPONENTS_FOUND) 7 7 include_directories(${TELEPATHY_FARSIGHT_INCLUDE_DIR} 8 8 + ${TELEPATHY_GLIB_INCLUDE_DIR} 9 - + ${DBUS_GLIB_INCLUDE_DIRS} 10 9 ${GSTREAMER_INCLUDE_DIR} 11 10 ${GLIB2_INCLUDE_DIR} 12 11 ${LIBXML2_INCLUDE_DIR} 13 - diff --git a/tests/lib/glib-helpers/CMakeLists.txt b/tests/lib/glib-helpers/CMakeLists.txt 14 - index bc75234..31cc833 100644 15 - --- a/tests/lib/glib-helpers/CMakeLists.txt 16 - +++ b/tests/lib/glib-helpers/CMakeLists.txt 17 - @@ -3,6 +3,7 @@ include_directories( 18 - ${TELEPATHY_GLIB_INCLUDE_DIR} 19 - ${GLIB2_INCLUDE_DIR} 20 - ${GOBJECT_INCLUDE_DIR} 21 - + ${DBUS_GLIB_INCLUDE_DIRS} 22 - ${DBUS_INCLUDE_DIR}) 23 - 24 - add_definitions(-DQT_NO_KEYWORDS)