diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2017-08-19 15:38:38 +0200 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2017-08-19 15:38:38 +0200 |
| commit | 95bb851d80391bd957ce3ea85fa5b1057029fe4f (patch) | |
| tree | 85b9221d3e745372bd9fe5bf1affb9d319b606b2 | |
| parent | acf01cbc6ca8523615f672af95c048c0791ad240 (diff) | |
| download | nixpkgs-95bb851d80391bd957ce3ea85fa5b1057029fe4f.tar nixpkgs-95bb851d80391bd957ce3ea85fa5b1057029fe4f.tar.gz nixpkgs-95bb851d80391bd957ce3ea85fa5b1057029fe4f.tar.bz2 nixpkgs-95bb851d80391bd957ce3ea85fa5b1057029fe4f.tar.lz nixpkgs-95bb851d80391bd957ce3ea85fa5b1057029fe4f.tar.xz nixpkgs-95bb851d80391bd957ce3ea85fa5b1057029fe4f.tar.zst nixpkgs-95bb851d80391bd957ce3ea85fa5b1057029fe4f.zip | |
fcitx-engines.mozc, ibus-engines.mozc: fix build
This is a temporary workaround for https://github.com/NixOS/nixpkgs/issues/28223
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 896dc4e8e5e..4081fad4ffb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |