From 4981d6d2e7fcd97b2478f8d69974a9e03361cc6d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" <urkud.urkud@gmail.com> Date: Tue, 13 Mar 2012 23:15:06 +0000 Subject: [PATCH] Fix telepathy-qt compilation svn path=/nixpkgs/trunk/; revision=33053 --- .../libraries/telepathy-qt/default.nix | 2 +- .../libraries/telepathy-qt/missing-include.patch | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/telepathy-qt/default.nix b/pkgs/development/libraries/telepathy-qt/default.nix index 0f5916e7ade6..c23e351b4ff7 100644 --- a/pkgs/development/libraries/telepathy-qt/default.nix +++ b/pkgs/development/libraries/telepathy-qt/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { patches = [ ./missing-include.patch ]; preBuild = '' - NIX_CFLAGS_COMPILE+=" `pkg-config --cflags farsight2-0.10`" + NIX_CFLAGS_COMPILE+=" `pkg-config --cflags farsight2-0.10 dbus-glib-1`" ''; } diff --git a/pkgs/development/libraries/telepathy-qt/missing-include.patch b/pkgs/development/libraries/telepathy-qt/missing-include.patch index 557a62160333..c5e3e259aa2e 100644 --- a/pkgs/development/libraries/telepathy-qt/missing-include.patch +++ b/pkgs/development/libraries/telepathy-qt/missing-include.patch @@ -2,23 +2,10 @@ diff --git a/TelepathyQt/Farsight/CMakeLists.txt b/TelepathyQt/Farsight/CMakeLis index 89ec354..376f3cc 100644 --- a/TelepathyQt/Farsight/CMakeLists.txt +++ b/TelepathyQt/Farsight/CMakeLists.txt -@@ -1,5 +1,7 @@ +@@ -1,5 +1,6 @@ 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)