Merge pull request #95597 from gebner/fix-mozc

This commit is contained in:
Gabriel Ebner
2020-08-16 19:17:09 +02:00
committed by GitHub
3 changed files with 19 additions and 9 deletions
+2 -2
View File
@@ -2741,7 +2741,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 { };
@@ -3472,7 +3472,7 @@ in
mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc {
python = python2;
inherit (python2Packages) gyp;
protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
};
table-extra = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-extra { };