mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 05:31:22 +00:00
Code Issues Wiki Activity

fcitx: drop patches, use extra-cmake-modules directly

Browse source 
Fixes #17252. (Really, this time.)

Now that extra-cmake-modules does not depend on Qt 5, it is possible to
depend on it directly.
This commit is contained in:
Thomas Tuegel 2016-07-29 08:59:01 -05:00
parent e15f259f9b
commit 2056f56f77
3 changed files with 8 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/tools/inputmethods/fcitx/fcitx-ecm.patch
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

14
pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
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,17 +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 ];
buildInputs = [ cmake fcitx pkgconfig qtbase ];
buildInputs = [ fcitx qtbase ];
preInstall = ''
substituteInPlace platforminputcontext/cmake_install.cmake \

16
pkgs/tools/inputmethods/fcitx/unwrapped.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, cmake, intltool, gettext
, libxml2, enchant, isocodes, icu, libpthreadstubs
, pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
, dbus, gtk2, gtk3, qt4, kde5
, dbus, gtk2, gtk3, qt4, extra-cmake-modules
}:
stdenv.mkDerivation rec {
@ -13,22 +13,16 @@ stdenv.mkDerivation rec {
sha256 = "0xvcmm4yi7kagf55d0yl3ql5ssbkm9410fwbz3kd988pchichdsk";
};
postUnpack = ''
ln -s ${kde5.extra-cmake-modules}/share/ECM/modules/ECMFindModuleHelpers.cmake \
$sourceRoot/cmake/
'';
patches = [ ./fcitx-ecm.patch ];
postPatch = ''
substituteInPlace src/frontend/qt/CMakeLists.txt \
--replace $\{QT_PLUGINS_DIR} $out/lib/qt4/plugins
'';
nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig ];
buildInputs = [
cmake enchant gettext isocodes pkgconfig intltool icu
libpthreadstubs libXau libXdmcp libxkbfile libxkbcommon libxml2
dbus cairo gtk2 gtk3 pango qt4
enchant gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile
libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4
];
cmakeFlags = ''