diff options
| author | Vonfry <mail@vonfry.name> | 2021-06-02 20:42:28 +0800 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-04 10:06:12 +0000 |
| commit | 10d45f3fda27bbe0fd7d250a972a109eef50d482 (patch) | |
| tree | 5e9a74655dbc3cb6fc95fe0489acd4358e6dc7b4 | |
| parent | fcitx5-configtool: 5.0.4 -> 5.0.5 (diff) | |
| download | nixpkgs-10d45f3fda27bbe0fd7d250a972a109eef50d482.tar.gz | |
fcitx5-gtk: 5.0.3 -> 5.0.7
(cherry picked from commit 55dfc47900d90018abaed36d78ef79724c4b9b7f)
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 1b76cec554d8..7b27184cde32 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 |