diff options
| author | Matthieu Coudron <coudron@iij.ad.jp> | 2019-04-24 22:12:54 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-24 22:12:54 +0900 |
| commit | 65a963235c97ca91260742d35b8b40e1544e33bd (patch) | |
| tree | 5743bfb36f20734de451f91458a68aca27e4f300 /pkgs/top-level/all-packages.nix | |
| parent | f1af633eecc2a4d6e108bb04d75eb5d6fb80155e (diff) | |
| parent | a5ed6ab73e617e01fea6d8e73f58deeaf5817d18 (diff) | |
| download | nixlib-65a963235c97ca91260742d35b8b40e1544e33bd.tar nixlib-65a963235c97ca91260742d35b8b40e1544e33bd.tar.gz nixlib-65a963235c97ca91260742d35b8b40e1544e33bd.tar.bz2 nixlib-65a963235c97ca91260742d35b8b40e1544e33bd.tar.lz nixlib-65a963235c97ca91260742d35b8b40e1544e33bd.tar.xz nixlib-65a963235c97ca91260742d35b8b40e1544e33bd.tar.zst nixlib-65a963235c97ca91260742d35b8b40e1544e33bd.zip | |
Merge pull request #60152 from Lucus16/unpin-protobuf
Revert "ibus-packages.mozc: pin to protobuf 3.6"
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2057595f7cd8..2fa66be2dcd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2148,7 +2148,7 @@ in mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec { python = python2; inherit (python2Packages) gyp; - protobuf = pkgs.protobuf3_6.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { |