diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-10 18:43:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-10 18:43:57 -0400 |
| commit | 2bcd4fa96d47f246b1577c59c2561f9b8dc38314 (patch) | |
| tree | d94e9fda479f5a7e4ee1b742d388193c182e48aa /pkgs | |
| parent | 9cbc8f38a6a7a05336fdb68002f82133e13aba3b (diff) | |
| parent | b4b332bcad4f9f79e7fa9fc3115afeb67ead5162 (diff) | |
| download | nixpkgs-2bcd4fa96d47f246b1577c59c2561f9b8dc38314.tar nixpkgs-2bcd4fa96d47f246b1577c59c2561f9b8dc38314.tar.gz nixpkgs-2bcd4fa96d47f246b1577c59c2561f9b8dc38314.tar.bz2 nixpkgs-2bcd4fa96d47f246b1577c59c2561f9b8dc38314.tar.lz nixpkgs-2bcd4fa96d47f246b1577c59c2561f9b8dc38314.tar.xz nixpkgs-2bcd4fa96d47f246b1577c59c2561f9b8dc38314.tar.zst nixpkgs-2bcd4fa96d47f246b1577c59c2561f9b8dc38314.zip | |
Merge pull request #68443 from ivan/mozc-gcc8-fix
ibus-engines.mozc: fix build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 5699a7931db..a33eb277926 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,5 +1,5 @@ -{ clangStdenv, fetchFromGitHub, which, ninja, python, gyp, pkgconfig, protobuf -, ibus, gtk2, zinnia, qt5, libxcb }: +{ clangStdenv, fetchFromGitHub, fetchpatch, which, ninja, python, gyp, pkgconfig +, protobuf, ibus, gtk2, zinnia, qt5, libxcb }: let japanese_usage_dictionary = fetchFromGitHub { @@ -31,6 +31,14 @@ in clangStdenv.mkDerivation rec { sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx"; }; + patches = [ + # https://github.com/google/mozc/pull/444 - fix for gcc8 STL + (fetchpatch { + url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch"; + sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla"; + }) + ]; + postUnpack = '' rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/ ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary |