From 6ce9c5e97cc19ff6fb8609b91c55ea0433de4cbb Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Wed, 20 Jun 2018 16:43:43 +0900 Subject: [PATCH] fcitx-qt5: fix build with Qt 5.11 --- pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 1a3352676b1..50ab7d85c5a 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 ];