diff options
author | Gabriel Ebner <gebner@gebner.org> | 2020-08-16 16:39:50 +0200 |
---|---|---|
committer | Gabriel Ebner <gebner@gebner.org> | 2020-08-16 16:39:50 +0200 |
commit | 748cbf93587a3de5a1fb1235922301269955d4e4 (patch) | |
tree | 400ffa5384298a387e39e12c691af3a19f9d0abe /pkgs | |
parent | 776a8f5c899746d74b55d921ccd4221dc9a8fb7e (diff) |
ibus-engines.mozc: fix build and support new era
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 9b73345d5e8e..bd34f2c49a5f 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -37,6 +37,11 @@ in clangStdenv.mkDerivation rec { url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch"; sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla"; }) + # Support dates after 2019 + (fetchpatch { + url = "https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/add_support_new_japanese_era.patch"; + sha256 = "1dsiiglrmm8i8shn2hv0j2b8pv6miysjrimj4569h606j4lwmcw2"; + }) ]; postUnpack = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff97844d9234..f0ffeb77bfa6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2743,7 +2743,7 @@ in mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { python = python2; inherit (python2Packages) gyp; - protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { }; |