From c0ae9cf8d1ccd7a9fe236b0a13d839bc4976acb9 Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fabian@meumertzhe.im>
Date: Tue, 24 Jun 2025 15:23:14 +0200
Subject: [PATCH] Fix runfiles merging for `@bazel_tools//tools/bash/runfiles`

This is required in Bazel 8.3.0, where this target gained runfiles.
---
 skylib/run_in_workspace.bzl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/skylib/run_in_workspace.bzl b/skylib/run_in_workspace.bzl
index 04bb9e0b..f25cda1a 100644
--- a/skylib/run_in_workspace.bzl
+++ b/skylib/run_in_workspace.bzl
@@ -52,8 +52,9 @@ cd $(dirname $(readlink {root_file}))
         files = [
             ctx.file.cmd,
             ctx.file.root_file,
-        ] + ctx.files._bash_runfiles,
+        ],
     )
+    runfiles = runfiles.merge(ctx.attr._bash_runfiles[DefaultInfo].default_runfiles)
     return [DefaultInfo(runfiles = runfiles)]
 
 _workspace_binary_script = rule(
@@ -67,7 +68,6 @@ _workspace_binary_script = rule(
             allow_single_file = True,
         ),
         "_bash_runfiles": attr.label(
-            allow_files = True,
             default = "@bazel_tools//tools/bash/runfiles",
         ),
     },