From 6eb45d767fecc57cad444c285e05456b939d2294 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 30 Mar 2012 09:03:35 +0000 Subject: [PATCH] telepathy-qt: farsight -> farstream svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33488 --- pkgs/development/libraries/telepathy/qt/default.nix | 11 ++++------- .../libraries/telepathy/qt/missing-include.patch | 11 ----------- 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/telepathy/qt/missing-include.patch diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index a620526ff85..64067a61e3e 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib -, telepathy_farsight, telepathy_glib }: +, telepathy_farstream, telepathy_glib }: stdenv.mkDerivation rec { name = "telepathy-qt-0.9.1"; @@ -10,11 +10,8 @@ stdenv.mkDerivation rec { }; buildNativeInputs = [ cmake pkgconfig python libxslt ]; - propagatedBuildInputs = [ qt4 dbus_glib telepathy_farsight telepathy_glib ]; - - patches = [ ./missing-include.patch ]; - + propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib ]; preBuild = '' - NIX_CFLAGS_COMPILE+=" `pkg-config --cflags farsight2-0.10 dbus-glib-1`" - ''; + NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" + ''; } diff --git a/pkgs/development/libraries/telepathy/qt/missing-include.patch b/pkgs/development/libraries/telepathy/qt/missing-include.patch deleted file mode 100644 index c5e3e259aa2..00000000000 --- a/pkgs/development/libraries/telepathy/qt/missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -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,6 @@ - if(FARSIGHT_COMPONENTS_FOUND) - include_directories(${TELEPATHY_FARSIGHT_INCLUDE_DIR} -+ ${TELEPATHY_GLIB_INCLUDE_DIR} - ${GSTREAMER_INCLUDE_DIR} - ${GLIB2_INCLUDE_DIR} - ${LIBXML2_INCLUDE_DIR}