From 583684024e37101e696c2def51788b320eb4bc54 Mon Sep 17 00:00:00 2001 From: Matthieu Daniel-Thomas Date: Wed, 23 Oct 2024 13:53:28 +0200 Subject: [PATCH] phoebus-setup-hook: simplify flags --- pkgs/epnix/tools/phoebus/setup-hook/setup-hook.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/epnix/tools/phoebus/setup-hook/setup-hook.sh b/pkgs/epnix/tools/phoebus/setup-hook/setup-hook.sh index 0da6610d..b5e02b58 100644 --- 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" }