mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
fcitx-engines.mozc, ibus-engines.mozc: fix build
This is a temporary workaround for https://github.com/NixOS/nixpkgs/issues/28223
This commit is contained in:
parent
acf01cbc6c
commit
95bb851d80
@ -1427,10 +1427,11 @@ with pkgs;
|
||||
|
||||
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;
|
||||
inherit (python2Packages) gyp;
|
||||
protobuf = protobuf3_2.override { stdenv = clangStdenv; };
|
||||
protobuf = protobuf3_2.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
|
||||
};
|
||||
|
||||
table = callPackage ../tools/inputmethods/ibus-engines/ibus-table {
|
||||
@ -1900,10 +1901,11 @@ with pkgs;
|
||||
|
||||
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;
|
||||
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 { };
|
||||
|
Loading…
Reference in New Issue
Block a user