From 87dba28e72f59617665704029cf4fdda97f93da2 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 20 Dec 2024 17:37:39 +0100 Subject: [PATCH] mozc: devendor protobuf This also fixes the build for GCC 14. --- pkgs/by-name/mo/mozc/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/mozc/package.nix b/pkgs/by-name/mo/mozc/package.nix index a1b0e804f452..f32de2fd5f62 100644 --- a/pkgs/by-name/mo/mozc/package.nix +++ b/pkgs/by-name/mo/mozc/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, qt6, pkg-config, + protobuf_27, bazel, ibus, unzip, @@ -18,7 +19,7 @@ let in buildBazelPackage rec { pname = "mozc"; - version = "2.30.5544.102"; + version = "2.30.5544.102"; # make sure to update protobuf if needed src = fetchFromGitHub { owner = "google"; @@ -63,6 +64,9 @@ buildBazelPackage rec { bazelTargets = [ "package" ]; postPatch = '' + # replace protobuf with our own + rm -r src/third_party/protobuf + cp -r ${protobuf_27.src} src/third_party/protobuf substituteInPlace src/config.bzl \ --replace-fail "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" \ --replace-fail "/usr" "$out"