diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-04 18:14:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 18:14:51 +0000 |
| commit | cb36dd7449c2cd8ed0d9c9946a3ffe0460a742b1 (patch) | |
| tree | abe3563a0bfd150dd72db39d0b1def08b359c74e /pkgs/top-level | |
| parent | 5524c43f2c0cc246de33d6eff378dcad843b2617 (diff) | |
| parent | b66ea6fc39acc588ecc8ccb1409995f2444862df (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 855cf321e01d..037e6a5fc31b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3044,8 +3044,7 @@ in m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { - python = python2; - inherit (python2Packages) gyp; + stdenv = clangStdenv; protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; |