diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-03-20 04:20:00 +0000 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2021-03-20 04:20:00 +0000 |
| commit | f3228cce6de1cfdbbf80920e5166fcbf46a51c7e (patch) | |
| tree | a5c718f13dca1d69f3876c39fa82c32ef539a367 /pkgs/tools/inputmethods | |
| parent | 21f865da07c6459d80cfd1928bd8d84180a74d5c (diff) | |
| download | nixpkgs-f3228cce6de1cfdbbf80920e5166fcbf46a51c7e.tar nixpkgs-f3228cce6de1cfdbbf80920e5166fcbf46a51c7e.tar.gz nixpkgs-f3228cce6de1cfdbbf80920e5166fcbf46a51c7e.tar.bz2 nixpkgs-f3228cce6de1cfdbbf80920e5166fcbf46a51c7e.tar.lz nixpkgs-f3228cce6de1cfdbbf80920e5166fcbf46a51c7e.tar.xz nixpkgs-f3228cce6de1cfdbbf80920e5166fcbf46a51c7e.tar.zst nixpkgs-f3228cce6de1cfdbbf80920e5166fcbf46a51c7e.zip | |
fcitx5-mozc: use nixpkgs abseil
Diffstat (limited to 'pkgs/tools/inputmethods')
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix index 08f43b87cfe..d077b0a25c5 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix @@ -9,17 +9,6 @@ let rev = "e5b3425575734c323e1d947009dd74709437b684"; sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; }; - # abseil-cpp in nixpkgs is too old - abseil-cpp_2020923 = abseil-cpp.overrideAttrs (old: rec { - version = "20200923.2"; - src = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - rev = version; - sha256 = "G+wkaC4IPtyc/xCUyVFJOcHppPFU7KkhIHjv6uhVKGU="; - }; - cmakeFlags = [ "-DCMAKE_CXX_STANDARD=17" "-DBUILD_SHARED_LIBS=ON" ]; - }); zipcode_rel = "202011"; jigyosyo = fetchurl { url = "https://osdn.net/projects/ponsfoot-aur/storage/mozc/jigyosyo-${zipcode_rel}.zip"; @@ -44,7 +33,7 @@ in clangStdenv.mkDerivation rec { nativeBuildInputs = [ gyp ninja mesa python pkg-config qt5.wrapQtAppsHook six which unzip ]; - buildInputs = [ protobuf zinnia qt5.qtbase fcitx5 abseil-cpp_2020923 jsoncpp gtest gtk2 ]; + buildInputs = [ protobuf zinnia qt5.qtbase fcitx5 abseil-cpp jsoncpp gtest gtk2 ]; patches = [ # Support linking system abseil-cpp |