git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #68443 from ivan/mozc-gcc8-fix

ibus-engines.mozc: fix build

commit2bcd4fa96d47f246b1577c59c2561f9b8dc38314 authorworldofpeace <worldofpeace@protonmail.ch> dateTue 10 Sep 2019, 18:43 (7 years ago) parent9cbc8f3b4b332b
1 file changed+10−2
pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix+10−2
pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix+10−2
@@ -1,5 +1,5 @@
1−{ clangStdenv, fetchFromGitHub, which, ninja, python, gyp, pkgconfig, protobuf
2−, ibus, gtk2, zinnia, qt5, libxcb }:
1+{ clangStdenv, fetchFromGitHub, fetchpatch, which, ninja, python, gyp, pkgconfig
2+, protobuf, ibus, gtk2, zinnia, qt5, libxcb }:
33
44let
55 japanese_usage_dictionary = fetchFromGitHub {
@@ -31,6 +31,14 @@ in clangStdenv.mkDerivation rec {
3131 sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx";
3232 };
3333
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+ ];
41+
3442 postUnpack = ''
3543 rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/
3644 ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary