gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup! inline jar file discovery

Browse Source
This commit is contained in:
Simon Gardling
2025-12-13 21:45:13 -05:00
parent 10f14a18b5
commit 72553e5ee6
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/jm/jmeter/package.nix
+7 -15
View File
@@ -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