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

Merge pull request #68443 from ivan/mozc-gcc8-fix

Browse Source 
ibus-engines.mozc: fix build
This commit is contained in:
worldofpeace 2019-09-10 18:43:57 -04:00 committed by GitHub
commit 2bcd4fa96d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ clangStdenv, fetchFromGitHub, which, ninja, python, gyp, pkgconfig, protobuf { clangStdenv, fetchFromGitHub, fetchpatch, which, ninja, python, gyp, pkgconfig
, ibus, gtk2, zinnia, qt5, libxcb }: , protobuf, ibus, gtk2, zinnia, qt5, libxcb }:
let let
japanese_usage_dictionary = fetchFromGitHub { japanese_usage_dictionary = fetchFromGitHub {
@ -31,6 +31,14 @@ in clangStdenv.mkDerivation rec {
sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx"; 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 = '' postUnpack = ''
rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/ rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/
ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary