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

Merge pull request #42297 from mnacamura/fcitx-qt5

Browse Source 
fcitx-qt5: fix build with Qt 5.11
This commit is contained in:
Jörg Thalheim 2018-06-20 14:45:25 +01:00 committed by GitHub
commit d91c70171f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
View File

@ -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 ];