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

fcitx-engines.mozc, ibus-engines.mozc: fix build

Browse Source 
This is a temporary workaround for
https://github.com/NixOS/nixpkgs/issues/28223
This commit is contained in:
Gabriel Ebner 2017-08-19 15:38:38 +02:00
parent acf01cbc6c
commit 95bb851d80
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/top-level/all-packages.nix
View File

@ -1427,10 +1427,11 @@ with pkgs;
m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec {
clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223
python = python2; python = python2;
inherit (python2Packages) gyp; inherit (python2Packages) gyp;
protobuf = protobuf3_2.override { stdenv = clangStdenv; }; protobuf = protobuf3_2.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
}; };
table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { table = callPackage ../tools/inputmethods/ibus-engines/ibus-table {
@ -1900,10 +1901,11 @@ with pkgs;
m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { };
mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec {
clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223
python = python2; python = python2;
inherit (python2Packages) gyp; inherit (python2Packages) gyp;
protobuf = protobuf3_2.override { stdenv = clangStdenv; }; protobuf = protobuf3_2.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
}; };
table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { }; table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { };