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

Merge pull request #15915 from ericsagnes/pkg-update/fcitx

Browse Source 
fcitx: 4.2.9 -> 4.2.9.1, fix build
This commit is contained in:
Gabriel Ebner 2016-06-02 20:53:09 +02:00
commit 0e16c80f81
2 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/tools/inputmethods/fcitx/default.nix
View File

@ -1,27 +1,34 @@
{ stdenv, fetchurl, pkgconfig, cmake, intltool, gettext
, libxml2, enchant, isocodes, icu, libpthreadstubs
, pango, cairo, libxkbfile, libXau, libXdmcp
, pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
, dbus, gtk2, gtk3, qt4, kde5
}:
stdenv.mkDerivation rec {
name = "fcitx-${version}";
version = "4.2.9";
version = "4.2.9.1";
src = fetchurl {
url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz";
sha256 = "0v7wdf3qf74vz8q090w8k574wvfcpj9ksfcfdw93nmzyk1q5p4rs";
url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz";
sha256 = "0xvcmm4yi7kagf55d0yl3ql5ssbkm9410fwbz3kd988pchichdsk";
};
patchPhase = ''
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
'';
buildInputs = with stdenv.lib; [
cmake enchant pango gettext libxml2 isocodes pkgconfig libxkbfile
intltool cairo icu libpthreadstubs libXau libXdmcp
dbus gtk2 gtk3 qt4 kde5.extra-cmake-modules
buildInputs = [
cmake enchant gettext isocodes pkgconfig intltool icu
libpthreadstubs libXau libXdmcp libxkbfile libxkbcommon libxml2
dbus cairo gtk2 gtk3 pango qt4
];
cmakeFlags = ''
@ -34,11 +41,11 @@ stdenv.mkDerivation rec {
-DENABLE_XDGAUTOSTART=OFF
'';
meta = {
homepage = "https://code.google.com/p/fcitx/";
meta = with stdenv.lib; {
homepage = "https://github.com/fcitx/fcitx";
description = "A Flexible Input Method Framework";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ericsagnes ];
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ ericsagnes ];
};
}

25
pkgs/tools/inputmethods/fcitx/fcitx-ecm.patch Normal file
View File

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