From 27cad09e0100ab30cebe9aaeb4ae2f625ba63778 Mon Sep 17 00:00:00 2001
From: Rin Kuryloski <kuryloskip@vmware.com>
Date: Thu, 14 Jul 2022 16:15:11 +0200
Subject: [PATCH] Fixup the source_archive macro in dist.bzl

---
 BUILD.bazel | 4 +---
 dist.bzl    | 6 ++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index 6c0de08be75c..85ff1cba3325 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -145,9 +145,7 @@ pkg_tar(
 
 package_generic_unix(plugins = PLUGINS)
 
-source_archive(plugins = PLUGINS + [
-    "//deps/rabbitmq_cli:rabbitmqctl",
-])
+source_archive(plugins = PLUGINS)
 
 genrule(
     name = "test-logs",
diff --git a/dist.bzl b/dist.bzl
index 7f67faf71beb..83341d935baf 100644
--- a/dist.bzl
+++ b/dist.bzl
@@ -290,7 +290,9 @@ def source_archive(
         rabbitmq_workspace = "@"):
     source_tree(
         name = "source-tree",
-        deps = plugins,
+        deps = plugins + [
+            rabbitmq_workspace + "//deps/rabbitmq_cli:rabbitmqctl",
+        ],
     )
 
     pkg_tar(
@@ -305,7 +307,7 @@ def source_archive(
     pkg_tar(
         name = "cli-deps-archive",
         deps = [
-            "//deps/rabbitmq_cli:fetched_srcs",
+            rabbitmq_workspace + "//deps/rabbitmq_cli:fetched_srcs",
         ],
         package_dir = "deps/rabbitmq_cli",
     )