Commit 186054d2 authored by Dmitry Ivankov's avatar Dmitry Ivankov
Browse files

fcitx5-mozc: quickfix build

`bazel_7` upgrade to 7.3.1+ had a regression breaking `buildBazelPackage { bazel = bazel_7; }`.
See some discussion in https://github.com/NixOS/nixpkgs/pull/355723

`fcitx5-mozc` package should be currently buildable with bazel 6
https://github.com/NixOS/nixpkgs/pull/355723#issuecomment-2478580261
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 https://github.com/NixOS/nixpkgs/issues/355852
parent d903a3ee
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
{
  bazel_7,
  bazel_6,
  buildBazelPackage,
  fcitx5,
  fetchFromGitHub,
@@ -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;

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

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

  preConfigure = ''