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

telepathy-qt: Fix build (broken by cmake 2.8.12 and farstream 0.2).

Browse Source
This commit is contained in:
Petr Rockai 2014-02-12 22:09:39 +01:00
parent ae4e0ce73a
commit a03a0337e9
3 changed files with 54 additions and 0 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 Normal file
View File

@ -0,0 +1,25 @@
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)

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

@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig python libxslt ];
propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
patches = [ ./cmake-2.8.12.diff ./farstream-0.2.diff ];
preBuild = ''
NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
'';

28
pkgs/development/libraries/telepathy/qt/farstream-0.2.diff Normal file
View File

@ -0,0 +1,28 @@
diff -urB telepathy-qt/cmake/modules/FindFarstream.cmake new/cmake/modules/FindFarstream.cmake
--- telepathy-qt/cmake/modules/FindFarstream.cmake 2012-04-25 22:14:22.275967164 +0200
+++ new/cmake/modules/FindFarstream.cmake 2012-10-07 12:19:46.543103512 +0200
@@ -23,9 +23,9 @@
# in the find_path() and find_library() calls
find_package(PkgConfig)
if (FARSTREAM_MIN_VERSION)
- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION})
+ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2>=${FARSTREAM_MIN_VERSION})
else (FARSTREAM_MIN_VERSION)
- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1)
+ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2)
endif (FARSTREAM_MIN_VERSION)
set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER})
endif (NOT WIN32)
@@ -34,10 +34,10 @@
PATHS
${PC_FARSTREAM_INCLUDEDIR}
${PC_FARSTREAM_INCLUDE_DIRS}
- PATH_SUFFIXES farstream-0.1
+ PATH_SUFFIXES farstream-0.2
)
-find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1
+find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2
PATHS
${PC_FARSTREAM_LIBDIR}
${PC_FARSTREAM_LIBRARY_DIRS}