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

telepathy-qt: farsight -> farstream

Browse Source 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33488
This commit is contained in:
Yury G. Kudryashov 2012-03-30 09:03:35 +00:00
parent 19320cf6cc
commit 6eb45d767f
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/telepathy/qt/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib { stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib
, telepathy_farsight, telepathy_glib }: , telepathy_farstream, telepathy_glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "telepathy-qt-0.9.1"; name = "telepathy-qt-0.9.1";
@ -10,11 +10,8 @@ stdenv.mkDerivation rec {
}; };
buildNativeInputs = [ cmake pkgconfig python libxslt ]; buildNativeInputs = [ cmake pkgconfig python libxslt ];
propagatedBuildInputs = [ qt4 dbus_glib telepathy_farsight telepathy_glib ]; propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib ];
patches = [ ./missing-include.patch ];
preBuild = '' preBuild = ''
NIX_CFLAGS_COMPILE+=" `pkg-config --cflags farsight2-0.10 dbus-glib-1`" NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
''; '';
} }

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

@ -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}