fcitx: depend on extra-cmake-module from Qt 5

Fixes #17252.
This commit is contained in:
Thomas Tuegel 2016-07-28 18:47:06 -05:00
parent 4856a2a1ea
commit dd8c97a2c3
2 changed files with 3 additions and 38 deletions

View File

@ -1,25 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd54ad8..ebb33d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,7 @@ project(fcitx)
set(version 4.2.9)
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH "${ECM_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
set(CMAKE_AUTOMOC_RELAXED_MODE TRUE)
set_property(GLOBAL PROPERTY "__FCITX_INTERNAL_BUILD" On)
--- a/cmake/FindXKBCommon.cmake
+++ b/cmake/FindXKBCommon.cmake
@@ -1,5 +1,5 @@
-include(ECMFindModuleHelpersStub)
+include(ECMFindModuleHelpers)
ecm_find_package_version_check(XKBCommon)
--
2.8.0

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, kde5 }:
{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }:
stdenv.mkDerivation rec {
name = "fcitx-qt5-${version}";
@ -9,19 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1pj1b04n8r4kl7jh1qdv0xshgzb3zrmizfa3g5h3yk589h191vwc";
};
# The following is to not have a dependency on kde5 so the plugin can be part of qt5LibsFun
postUnpack = ''
${lib.concatMapStrings (f: ''
ln -s ${kde5.extra-cmake-modules}/share/ECM/modules/${f} $sourceRoot/cmake/
'')
[ "ECMFindModuleHelpers.cmake" "ECMGenerateHeaders.cmake"
"ECMPackageConfigHelpers.cmake" "ECMQueryQmake.cmake"
"ECMSetupVersion.cmake" "ECMVersionHeader.h.in" ]}
'';
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
patches = [ ./fcitx-qt5-ecm.patch ];
buildInputs = [ cmake fcitx pkgconfig qtbase ];
buildInputs = [ fcitx qtbase ];
preInstall = ''
substituteInPlace platforminputcontext/cmake_install.cmake \