From 95bb851d80391bd957ce3ea85fa5b1057029fe4f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Aug 2017 15:38:38 +0200 Subject: [PATCH] fcitx-engines.mozc, ibus-engines.mozc: fix build This is a temporary workaround for https://github.com/NixOS/nixpkgs/issues/28223 --- pkgs/top-level/all-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 896dc4e8e5e2..4081fad4ffb7 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 { };