cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #125374 from Vonfry/update/fcitx5

Browse source
This commit is contained in:
Sandro 2021-06-04 09:53:52 +02:00 committed by GitHub
commit 07c93deb4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/inputmethods/fcitx5/default.nix
View file

@ -41,13 +41,13 @@ let
in
stdenv.mkDerivation rec {
pname = "fcitx5";
version = "5.0.4";
version = "5.0.8";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5";
repo = pname;
rev = version;
sha256 = "sha256-2KGdR1m70Qatidzf/DZuFK3lc1t8z7sxjyhaxuc0Tqg=";
sha256 = "0czj2awvgk9apdh9rj3vcb04g8x2wp1d4sshvch31nwpqs10hssr";
};
prePatch = ''

6
pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
View file

@ -19,13 +19,13 @@
mkDerivation rec {
pname = "fcitx5-configtool";
version = "5.0.4";
version = "5.0.5";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-configtool";
repo = pname;
rev = version;
sha256 = "sha256-UO3Ob+bFQ/2Vqb8YpD9tfmfZt5YLUyoqcbtsHLaVOzE=";
sha256 = "0w6cgg57ldk02j3fs7mm8pn5inblcjyr20d3xl5qbyawwccjsn2m";
};
cmakeFlags = [

15
pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
View file

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

4
pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-lua";
version = "5.0.4";
version = "5.0.5";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-lua";
rev = version;
sha256 = "sha256-1gKfFq+x/tCOYqESO49Qddp5z6zXO7ULjTJgDEl8BqI=";
sha256 = "0x7b78rz9mdyhm3y8yi7kihah7fgqzjyfgqwjyfx3i90wxflnmmc";
};
nativeBuildInputs = [

7
pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
View file

@ -1,5 +1,4 @@
{ lib, stdenv
, fetchurl
, fetchFromGitHub
, pkg-config
, cmake
@ -12,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-rime";
version = "5.0.4";
version = "5.0.6";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-rime";
repo = pname;
rev = version;
sha256 = "sha256-WB+bWvJxL2yywictNN8Zy0OYxiCRErQGL2dGH4zQPp8=";
sha256 = "1r36c1pl63vka9mxa8f5x0kijapjgxzz5b4db8h87ri9kcxk7i2g";
};
cmakeFlags = [

6
pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-table-extra";
version = "5.0.2";
version = "5.0.4";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-table-extra";
repo = pname;
rev = version;
sha256 = "sha256-Bqxdi/rjiTKqHLvVFVcQMjz/I0xxTiBgUIRkZjLuK+M=";
sha256 = "1rhm9jyqxlsgjsn3f5n9jwm5qjcgg87widp0bv1xa9cc23mydrqv";
};
nativeBuildInputs = [

6
pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-table-other";
version = "5.0.3";
version = "5.0.5";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-table-other";
repo = pname;
rev = version;
sha256 = "sha256-jJTFAOrBeRBoUn0mqqkX0z1zQnDOh7otMHDPmjuZbWw=";
sha256 = "0z34y05sbb2qavpa6banv7xvlsmpymmm828265r8bf7r995wx8lz";
};
nativeBuildInputs = [