diff options
| author | Mitsuhiro Nakamura <m.nacamura@gmail.com> | 2018-06-20 16:43:43 +0900 |
|---|---|---|
| committer | Mitsuhiro Nakamura <m.nacamura@gmail.com> | 2018-06-20 21:55:39 +0900 |
| commit | 6ce9c5e97cc19ff6fb8609b91c55ea0433de4cbb (patch) | |
| tree | 5e5239d97737b224a6251d8d48860e8695bccc47 /pkgs/tools/inputmethods | |
| parent | 142a2289ff72af59220d6a47a85c6fae81848984 (diff) | |
| download | nixlib-6ce9c5e97cc19ff6fb8609b91c55ea0433de4cbb.tar nixlib-6ce9c5e97cc19ff6fb8609b91c55ea0433de4cbb.tar.gz nixlib-6ce9c5e97cc19ff6fb8609b91c55ea0433de4cbb.tar.bz2 nixlib-6ce9c5e97cc19ff6fb8609b91c55ea0433de4cbb.tar.lz nixlib-6ce9c5e97cc19ff6fb8609b91c55ea0433de4cbb.tar.xz nixlib-6ce9c5e97cc19ff6fb8609b91c55ea0433de4cbb.tar.zst nixlib-6ce9c5e97cc19ff6fb8609b91c55ea0433de4cbb.zip | |
fcitx-qt5: fix build with Qt 5.11
Diffstat (limited to 'pkgs/tools/inputmethods')
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 1a3352676b15..50ab7d85c5ac 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }: +{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules +, fetchpatch +}: stdenv.mkDerivation rec { name = "fcitx-qt5-${version}"; @@ -9,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0z8ax0dxk88byic41mfaiahjdv1k8ciwn97xfjkkgr4ijgscdr8c"; }; + patches = [ + # Fix build with Qt 5.11 + # https://github.com/fcitx/fcitx-qt5/issues/34 + (fetchpatch { + url = https://github.com/fcitx/fcitx-qt5/commit/af033e3d5305108eecc568adff7f8b2da5831ed6.diff; + sha256 = "14vfz1fw2k362wnqpglw766fg3d3mc8cmfgic2p96yyipjh9xx3b"; + }) + ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; buildInputs = [ fcitx qtbase ]; |