@@ -1,5 +1,5 @@
1−{ clangStdenv, fetchFromGitHub, fetchpatch, which, ninja, python, gyp, pkgconfig
2−, protobuf, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese }:
1+{ stdenv, fetchFromGitHub, which, ninja, python, pkgconfig, protobuf
2+, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }:
33
44let
55 japanese_usage_dictionary = fetchFromGitHub {
@@ -8,11 +8,11 @@ let
88 rev = "e5b3425575734c323e1d947009dd74709437b684";
99 sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm";
1010 };
11−in clangStdenv.mkDerivation rec {
11+in stdenv.mkDerivation rec {
1212 name = "ibus-mozc-${version}";
13− version = "2.23.2815.102";
13+ version = "2.23.4206.102";
1414
15− meta = with clangStdenv.lib; {
15+ meta = with stdenv.lib; {
1616 isIbusEngine = true;
1717 description = "Japanese input method from Google";
1818 homepage = "https://github.com/google/mozc";
@@ -21,37 +21,28 @@ in clangStdenv.mkDerivation rec {
2121 maintainers = with maintainers; [ gebner ericsagnes ];
2222 };
2323
24− nativeBuildInputs = [ which ninja python gyp pkgconfig qt5.wrapQtAppsHook ];
24+ nativeBuildInputs = [ which ninja python3Packages.python python3Packages.six
25+ python3Packages.gyp pkgconfig qt5.wrapQtAppsHook ];
2526 buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ];
2627
2728 src = fetchFromGitHub {
2829 owner = "google";
2930 repo = "mozc";
30− rev = "afb03ddfe72dde4cf2409863a3bfea160f7a66d8";
31− sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx";
31+ rev = "91cc1e19ef34aeb12888b697fefa52907f1a834d";
32+ sha256 = "1fyy9g1pnaq6s5nkf56aqmp5mgyibbmp1ylc64fqc6g1plg90zk2";
33+ fetchSubmodules = true;
3234 };
3335
34− patches = [
35− # https://github.com/google/mozc/pull/444 - fix for gcc8 STL
36− (fetchpatch {
37− url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch";
38− sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla";
39− })
40− # Support dates after 2019
41− (fetchpatch {
42− url = "https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/add_support_new_japanese_era.patch";
43− sha256 = "1dsiiglrmm8i8shn2hv0j2b8pv6miysjrimj4569h606j4lwmcw2";
44− })
45− ];
46−
4736 postUnpack = ''
48− rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/
37+ rm -rf $sourceRoot/src/third_party/japanese_usage_dictionary/
4938 ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary
39+ '' + stdenv.lib.optionalString stdenv.isLinux ''
40+ sed -i 's/-lc++/-lstdc++/g' $sourceRoot/src/gyp/common.gypi
5041 '';
5142
5243 configurePhase = ''
5344 export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model"
54− cd src && python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc
45+ cd src && python build_mozc.py gyp --gypdir=${python3Packages.gyp}/bin --server_dir=$out/lib/mozc
5546 '';
5647
5748 buildPhase = ''