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

telepathy_qt: minor update, drop not applying patch

Browse Source 
Also enableParallelBuilding.
This commit is contained in:
Vladimír Čunát 2014-06-19 23:02:18 +02:00
parent c7c626a897
commit 5c482db0dd
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff
View File

@ -1,25 +0,0 @@
diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake
index c2eac76..b3131f0 100644
--- a/cmake/modules/FindQt.cmake
+++ b/cmake/modules/FindQt.cmake
@@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS)
MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
IF(QT_VERSION_MAJOR MATCHES 4)
- QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
+ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
+ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
+ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
ELSE(QT_VERSION_MAJOR MATCHES 4)
IF(QT_VERSION_MAJOR MATCHES 5)
- QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
+ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
+ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
+ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
ENDIF(QT_VERSION_MAJOR MATCHES 5)
ENDIF(QT_VERSION_MAJOR MATCHES 4)
ENDMACRO(QT_CREATE_MOC_COMMAND)

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

@ -1,18 +1,25 @@
{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib
{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib, dbus_daemon
, telepathy_farstream, telepathy_glib, pythonDBus }:
stdenv.mkDerivation rec {
name = "telepathy-qt-0.9.3";
name = "telepathy-qt-0.9.4";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
sha256 = "1yabyhsikw828ns7cf6hvzbxdxh53na1ck0q7qsav1lvlyz5gzy0";
sha256 = "1wk13rwpas1crj19xsbgl1c4qzri616xxa1hyhnykv4nkwxdpcgi";
};
patches = [ ./farstream-0.2.diff ];
nativeBuildInputs = [ cmake pkgconfig python libxslt ];
propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
patches = [ ./cmake-2.8.12.diff ./farstream-0.2.diff ];
buildInputs = stdenv.lib.optional doCheck dbus_daemon;
preBuild = ''
NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
'';
enableParallelBuilding = true;
doCheck = false; # giving up for now
}