From 10d45f3fda27bbe0fd7d250a972a109eef50d482 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Wed, 2 Jun 2021 20:42:28 +0800 Subject: [PATCH] fcitx5-gtk: 5.0.3 -> 5.0.7 (cherry picked from commit 55dfc47900d90018abaed36d78ef79724c4b9b7f) --- pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 1b76cec554d..7b27184cde3 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -4,9 +4,11 @@ , extra-cmake-modules , fcitx5 , gobject-introspection +, glib , gtk2 , gtk3 , gtk4 +, fmt , pcre , libuuid , libselinux @@ -24,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.3"; + version = "5.0.7"; src = fetchFromGitHub { owner = "fcitx"; - repo = "fcitx5-gtk"; + repo = pname; rev = version; - sha256 = "sha256-+BzXbZyzC3fvLqysufblk0zK9fAg5jslVdm/v3jz4B4="; + sha256 = "0vcikqrxv1xxcdaiz3axgm7rpab4w8aciw838sbpa9l20dp8cnyq"; }; cmakeFlags = [ @@ -39,8 +41,10 @@ stdenv.mkDerivation rec { ] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off"; buildInputs = [ + glib gtk3 gtk4 + fmt gobject-introspection fcitx5 pcre @@ -57,6 +61,11 @@ stdenv.mkDerivation rec { libXtst ] ++ lib.optional withGTK2 gtk2; + NIX_CFLAGS_COMPILE = lib.concatMapStringsSep " " (s: "-isystem ${s}") [ + "${glib.dev}/include/gio-unix-2.0" + "${glib.dev}/include/glib-2.0" + ]; + nativeBuildInputs = [ cmake extra-cmake-modules