Skip to content

Commit

Permalink
fcitx5-mozc: quickfix build
Browse files Browse the repository at this point in the history
`bazel_7` upgrade to 7.3.1+ had a regression breaking `buildBazelPackage { bazel = bazel_7; }`.
See some discussion in NixOS#355723

`fcitx5-mozc` package should be currently buildable with bazel 6
NixOS#355723 (comment)
Hopefully by the time it requires 7+ `buildBazelPackage` will be fixed

So let's downgrade bazel for now to 6.x for this package to unblock the 24.11 release

Should fix NixOS#355852
  • Loading branch information
boltzmannrain committed Nov 16, 2024
1 parent d903a3e commit 186054d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkgs/by-name/fc/fcitx5-mozc/package.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
bazel_7,
bazel_6,
buildBazelPackage,
fcitx5,
fetchFromGitHub,
Expand Down Expand Up @@ -41,7 +41,7 @@ buildBazelPackage {
sed -i -e 's|^\(LINUX_MOZC_SERVER_DIR = \).\+|\1"${mozc}/lib/mozc"|' src/config.bzl
'';

bazel = bazel_7;
bazel = bazel_6;
removeRulesCC = false;
dontAddBazelOpts = true;

Expand All @@ -62,7 +62,7 @@ buildBazelPackage {
rm -rf $bazelOut/external/fcitx5
'';

sha256 = "sha256-wz2lJckr7Pu4jtoejjFv8LdjVO2+ferrS473M4jc86I=";
sha256 = "sha256-rrRp/v1pty7Py80/6I8rVVQvkeY72W+nlixUeYkjp+o=";
};

preConfigure = ''
Expand Down

0 comments on commit 186054d

Please sign in to comment.