phoebus-setup-hook: simplify flags

epics-extensions · Oct 23, 2024 · 5836840 · 5836840
1 parent 9bd91f8
commit 5836840
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/pkgs/epnix/tools/phoebus/setup-hook/setup-hook.sh b/pkgs/epnix/tools/phoebus/setup-hook/setup-hook.sh
@@ -6,7 +6,6 @@ installPhoebusJar() {
 	local jarName="$2"
 	local name="$3"
 	local mainClass="$4"
-	local D='"file.encoding=UTF-8"'
 
 
 	mkdir -p "$out/share/java"
@@ -26,10 +25,6 @@ installPhoebusJar() {
 	makeWrapper "@jdk@/bin/java" "$out/bin/$name" \
 		--add-flags "-classpath $out/share/java/$jarName:$depsPath/*" \
 		--add-flags '${JAVA_OPTS}' \
-		--add-flags "$mainClass"	\
-		--set-default JAVA_XMS "1G" \
-		--set-default JAVA_XMX "4G" \
-		--add-flags '-Xms$JAVA_XMS' \
-		--add-flags '-Xmx$JAVA_XMX' \
-		--add-flags "-Dfile.encoding=UTF-8"
+		--add-flags '"file.encoding=UTF-8"'\
+		--add-flags "$java_runtime_opts"
 }