alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

fctix-engines.mozc: fix build (#68457)

Browse source 
fctix-engines.mozc: fix build
This commit is contained in:
Gabriel Ebner 2019-09-11 10:09:37 +02:00 committed by GitHub
parent 129fddf6be fdccd9cd9b
commit 91754d5e8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/fcitx-engines/fcitx-mozc/default.nix
View file

@ -39,6 +39,11 @@ in clangStdenv.mkDerivation rec {
url = "https://download.fcitx-im.org/fcitx-mozc/${name}";
sha256 = "1f9m4310kz09v5qvnv75ka2vq63m7by023qrkpddgq4dv7gxx3ca";
})
# https://github.com/google/mozc/pull/444 - fix for gcc8 STL
(fetchpatch {
url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch";
sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla";
})
];
postPatch = ''

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

@ -3036,7 +3036,7 @@ in
mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc {
python = python2;
inherit (python2Packages) gyp;
protobuf = pkgs.protobuf3_6.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
};
table-extra = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-extra { };