From 72553e5ee6f763bf7ad501769624f155ab4de0c1 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Sat, 13 Dec 2025 21:34:43 -0500
Subject: [PATCH] fixup! inline jar file discovery

---
 pkgs/by-name/jm/jmeter/package.nix | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/jm/jmeter/package.nix b/pkgs/by-name/jm/jmeter/package.nix
index 89f534015d50..79cd9c61c04a 100644
--- a/pkgs/by-name/jm/jmeter/package.nix
+++ b/pkgs/by-name/jm/jmeter/package.nix
@@ -81,22 +81,14 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Fix mirror-server.sh classpath: discover actual jar names at build time
     # The script has hardcoded jar versions that don't match the built jars
-    oro_jar=$(basename $out/lib/oro-*.jar)
-    slf4j_api_jar=$(basename $out/lib/slf4j-api-*.jar)
-    jcl_over_slf4j_jar=$(basename $out/lib/jcl-over-slf4j-*.jar)
-    log4j_slf4j_impl_jar=$(basename $out/lib/log4j-slf4j-impl-*.jar)
-    log4j_api_jar=$(basename $out/lib/log4j-api-*.jar)
-    log4j_core_jar=$(basename $out/lib/log4j-core-*.jar)
-    log4j_1_2_api_jar=$(basename $out/lib/log4j-1.2-api-*.jar)
-
     substituteInPlace $out/bin/mirror-server.sh \
-      --replace-fail "oro-2.0.8.jar" "$oro_jar" \
-      --replace-fail "slf4j-api-1.7.25.jar" "$slf4j_api_jar" \
-      --replace-fail "jcl-over-slf4j-1.7.25.jar" "$jcl_over_slf4j_jar" \
-      --replace-fail "log4j-slf4j-impl-2.11.0.jar" "$log4j_slf4j_impl_jar" \
-      --replace-fail "log4j-api-2.11.1.jar" "$log4j_api_jar" \
-      --replace-fail "log4j-core-2.11.1.jar" "$log4j_core_jar" \
-      --replace-fail "log4j-1.2-api-2.11.1.jar" "$log4j_1_2_api_jar"
+      --replace-fail "oro-2.0.8.jar" "$(basename $out/lib/oro-*.jar)" \
+      --replace-fail "slf4j-api-1.7.25.jar" "$(basename $out/lib/slf4j-api-*.jar)" \
+      --replace-fail "jcl-over-slf4j-1.7.25.jar" "$(basename $out/lib/jcl-over-slf4j-*.jar)" \
+      --replace-fail "log4j-slf4j-impl-2.11.0.jar" "$(basename $out/lib/log4j-slf4j-impl-*.jar)" \
+      --replace-fail "log4j-api-2.11.1.jar" "$(basename $out/lib/log4j-api-*.jar)" \
+      --replace-fail "log4j-core-2.11.1.jar" "$(basename $out/lib/log4j-core-*.jar)" \
+      --replace-fail "log4j-1.2-api-2.11.1.jar" "$(basename $out/lib/log4j-1.2-api-*.jar)"
 
     # Prefix some scripts with jmeter to avoid clobbering the namespace
     for i in heapdump.sh mirror-server mirror-server.sh shutdown.sh stoptest.sh create-rmi-keystore.sh; do