apply patch through wrapper macro

bazel-contrib · Jan 28, 2025 · b800947 · b800947
1 parent c452c67
commit b800947
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/third_party/go/deps.bzl b/third_party/go/deps.bzl
@@ -28,9 +28,6 @@ def go_dependencies():
     go_repository(
         name = "com_github_bazelbuild_bazel_gazelle",
         importpath = "github.com/bazelbuild/bazel-gazelle",
-        patches = [
-            "//third_party/patches:gazelle_regexp.patch",
-        ],
         sum = "h1:SAYys3KRG5i3KTgQAvO423bLT1rQMSgqEKReMkM/CW0=",
         version = "v0.40.0",
     )

diff --git a/third_party/go/go_repository.bzl b/third_party/go/go_repository.bzl
@@ -6,4 +6,11 @@ def go_repository(**kwargs):
 
     # Work around https://github.com/bazelbuild/bazel-gazelle/issues/1344
     kwargs["build_external"] = "external"
+
+    # Work around for https://github.com/bazel-contrib/bazel-gazelle/pull/2021 until new release of bazel-gazelle
+    if kwargs["importpath"] == "github.com/bazelbuild/bazel-gazelle":
+        kwargs["patches"] = [
+            "//third_party/patches:gazelle_regexp.patch",
+        ]
+
     _go_repository(**kwargs)