summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-02-14 16:12:38 +0100
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2017-02-14 16:12:38 +0100
commit691df81ceaf618fa26f2578d91d6e376a9d66b21 (patch)
tree80de31f57929a64ad5d46c13760e37be0c94e521
parent3a358458e94207a1c73fc37fc55b655b42ea582b (diff)
downloadjava-691df81ceaf618fa26f2578d91d6e376a9d66b21.tar.gz
java-691df81ceaf618fa26f2578d91d6e376a9d66b21.tar.xz
java-env: don't define _JAVA_OPTIONS unconditionally
This break server-side stuff that use swing components with no graphical environment started Signed-off-by: Marc-Antoine Perennou <keruspe@exherbo.org>
-rw-r--r--packages/dev-java/java-env/java-env-1-r4.exheres-0 (renamed from packages/dev-java/java-env/java-env-1-r3.exheres-0)6
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/dev-java/java-env/java-env-1-r3.exheres-0 b/packages/dev-java/java-env/java-env-1-r4.exheres-0
index 172196c..f4eb03d 100644
--- a/packages/dev-java/java-env/java-env-1-r3.exheres-0
+++ b/packages/dev-java/java-env/java-env-1-r4.exheres-0
@@ -7,6 +7,8 @@ LICENCES="GPL-2"
SLOT="0"
PLATFORMS="~amd64 ~x86"
+MYOPTIONS="gtk [[ description = [ Use gtk+ theme by default ] ]]"
+
DEPENDENCIES=""
WORK="${WORKBASE}"
@@ -18,8 +20,10 @@ JAVACMD="/usr/$(exhost --target)/bin/java"
JAVA_HOME="/usr/$(exhost --target)/lib/jdk"
MOZ_PLUGIN_PATH="/usr/$(exhost --target)/lib/mozilla/plugins"
PATH="/usr/$(exhost --target)/lib/jdk/bin:/usr/$(exhost --target)/lib/jre/bin"
-_JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
COLON_SEPARATED="MOZ_PLUGIN_PATH"
EOF
+ option gtk && cat >> "${IMAGE}"/etc/env.d/45java <<EOF
+_JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
+EOF
}