public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ibus-engines.mozc: fix build and support new era

Browse Source
This commit is contained in:
Gabriel Ebner 2020-08-16 16:39:50 +02:00
parent 776a8f5c89
commit 748cbf9358
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
View File

@ -37,6 +37,11 @@ in clangStdenv.mkDerivation rec {
url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch"; url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch";
sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla"; 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 = '' postUnpack = ''

2
pkgs/top-level/all-packages.nix
View File

@ -2743,7 +2743,7 @@ in
mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
python = python2; python = python2;
inherit (python2Packages) gyp; 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 { }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { };