treewide: Correctly force Java font anti-aliasing to gasp mode (#422045)

authored by philiptaron.tngl.sh and committed by

GitHub 2ca95c8a 3a2db73d

+21 -21
+1 -1
pkgs/applications/editors/greenfoot/default.nix
··· 41 42 makeWrapper ${openjdk}/bin/java $out/bin/greenfoot \ 43 "''${gappsWrapperArgs[@]}" \ 44 - --add-flags "-Dawt.useSystemAAFontSettings=on -Xmx512M \ 45 --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED \ 46 -cp $out/share/greenfoot/boot.jar bluej.Boot \ 47 -greenfoot=true -bluej.compiler.showunchecked=false \
··· 41 42 makeWrapper ${openjdk}/bin/java $out/bin/greenfoot \ 43 "''${gappsWrapperArgs[@]}" \ 44 + --add-flags "-Dawt.useSystemAAFontSettings=gasp -Xmx512M \ 45 --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED \ 46 -cp $out/share/greenfoot/boot.jar bluej.Boot \ 47 -greenfoot=true -bluej.compiler.showunchecked=false \
+2 -2
pkgs/applications/graphics/processing/default.nix
··· 131 makeWrapper $out/share/${pname}/processing $out/bin/processing \ 132 ''${gappsWrapperArgs[@]} \ 133 --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ 134 - --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd 135 makeWrapper $out/share/${pname}/processing-java $out/bin/processing-java \ 136 ''${gappsWrapperArgs[@]} \ 137 --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ 138 - --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd 139 140 runHook postInstall 141 '';
··· 131 makeWrapper $out/share/${pname}/processing $out/bin/processing \ 132 ''${gappsWrapperArgs[@]} \ 133 --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ 134 + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" 135 makeWrapper $out/share/${pname}/processing-java $out/bin/processing-java \ 136 ''${gappsWrapperArgs[@]} \ 137 --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ 138 + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" 139 140 runHook postInstall 141 '';
+2 -2
pkgs/applications/misc/ganttproject-bin/default.nix
··· 34 }; 35 36 javaOptions = [ 37 - "-Dawt.useSystemAAFontSettings=on" 38 ]; 39 40 in ··· 45 mkdir -pv "$out/bin" 46 wrapProgram "$out/share/ganttproject/ganttproject" \ 47 --set JAVA_HOME "${jre}" \ 48 - --set _JAVA_OPTIONS "${builtins.toString javaOptions}" 49 50 mv -v "$out/share/ganttproject/ganttproject" "$out/bin" 51
··· 34 }; 35 36 javaOptions = [ 37 + "-Dawt.useSystemAAFontSettings=gasp" 38 ]; 39 40 in ··· 45 mkdir -pv "$out/bin" 46 wrapProgram "$out/share/ganttproject/ganttproject" \ 47 --set JAVA_HOME "${jre}" \ 48 + --prefix _JAVA_OPTIONS " " "${builtins.toString javaOptions}" 49 50 mv -v "$out/share/ganttproject/ganttproject" "$out/bin" 51
+1 -1
pkgs/by-name/bl/bluej/package.nix
··· 48 49 makeWrapper ${openjdk}/bin/java $out/bin/bluej \ 50 "''${gappsWrapperArgs[@]}" \ 51 - --add-flags "-Dawt.useSystemAAFontSettings=on -Xmx512M \ 52 --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED \ 53 -cp $out/share/bluej/boot.jar bluej.Boot" 54
··· 48 49 makeWrapper ${openjdk}/bin/java $out/bin/bluej \ 50 "''${gappsWrapperArgs[@]}" \ 51 + --add-flags "-Dawt.useSystemAAFontSettings=gasp -Xmx512M \ 52 --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED \ 53 -cp $out/share/bluej/boot.jar bluej.Boot" 54
+1 -1
pkgs/by-name/br/brmodelo/package.nix
··· 107 # _JAVA_AWT_WM_NONREPARENTING=1. 108 makeWrapper ${jdk8}/bin/java $out/bin/brmodelo \ 109 --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ 110 - --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" \ 111 --add-flags "-jar $out/share/java/brModelo.jar" 112 113 for size in 16 24 32 48 64 128 256; do
··· 107 # _JAVA_AWT_WM_NONREPARENTING=1. 108 makeWrapper ${jdk8}/bin/java $out/bin/brmodelo \ 109 --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ 110 + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" \ 111 --add-flags "-jar $out/share/java/brModelo.jar" 112 113 for size in 16 24 32 48 64 128 256; do
+1 -1
pkgs/by-name/ci/cie-middleware-linux/package.nix
··· 120 mkdir -p "$out/bin" 121 makeWrapper "${jre}/bin/java" "$out/bin/cieid" \ 122 --add-flags "-Djna.library.path='$out/lib:${libraries}'" \ 123 - --add-flags '-Dawt.useSystemAAFontSettings=on' \ 124 --add-flags "-cp $out/share/cieid/cieid.jar" \ 125 --add-flags "app.m0rf30.cieid.MainApplication" 126
··· 120 mkdir -p "$out/bin" 121 makeWrapper "${jre}/bin/java" "$out/bin/cieid" \ 122 --add-flags "-Djna.library.path='$out/lib:${libraries}'" \ 123 + --add-flags "-Dawt.useSystemAAFontSettings=gasp" \ 124 --add-flags "-cp $out/share/cieid/cieid.jar" \ 125 --add-flags "app.m0rf30.cieid.MainApplication" 126
+1 -1
pkgs/by-name/cr/crossfire-gridarta/package.nix
··· 37 38 makeWrapper ${jre}/bin/java $out/bin/crossfire-gridarta \ 39 --add-flags "-jar $out/share/java/CrossfireEditor.jar" \ 40 - --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=on' \ 41 --set _JAVA_AWT_WM_NONREPARENTING 1 42 43 runHook postInstall
··· 37 38 makeWrapper ${jre}/bin/java $out/bin/crossfire-gridarta \ 39 --add-flags "-jar $out/share/java/CrossfireEditor.jar" \ 40 + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" \ 41 --set _JAVA_AWT_WM_NONREPARENTING 1 42 43 runHook postInstall
+1 -1
pkgs/by-name/cr/crossfire-jxclient/package.nix
··· 57 58 makeWrapper ${jre}/bin/java $out/bin/crossfire-jxclient \ 59 --add-flags "-jar $out/share/java/jxclient.jar" \ 60 - --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=on' \ 61 --set _JAVA_AWT_WM_NONREPARENTING 1 62 63 runHook postInstall
··· 57 58 makeWrapper ${jre}/bin/java $out/bin/crossfire-jxclient \ 59 --add-flags "-jar $out/share/java/jxclient.jar" \ 60 + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" \ 61 --set _JAVA_AWT_WM_NONREPARENTING 1 62 63 runHook postInstall
+1 -1
pkgs/by-name/fr/freeplane/package.nix
··· 102 ] 103 } \ 104 --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ 105 - --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" 106 107 runHook postInstall 108 '';
··· 102 ] 103 } \ 104 --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ 105 + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" 106 107 runHook postInstall 108 '';
+1 -1
pkgs/by-name/ir/irpf/package.nix
··· 65 66 # make xdg-open overrideable at runtime 67 makeWrapper ${jdk11}/bin/java $out/bin/irpf \ 68 - --add-flags "-Dawt.useSystemAAFontSettings=on" \ 69 --add-flags "-Dswing.aatext=true" \ 70 --add-flags "-jar $BASEDIR/irpf.jar" \ 71 --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
··· 65 66 # make xdg-open overrideable at runtime 67 makeWrapper ${jdk11}/bin/java $out/bin/irpf \ 68 + --add-flags "-Dawt.useSystemAAFontSettings=gasp" \ 69 --add-flags "-Dswing.aatext=true" \ 70 --add-flags "-jar $BASEDIR/irpf.jar" \ 71 --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
+1 -1
pkgs/by-name/jf/jflap/package.nix
··· 55 mkdir -p $out/share/java 56 cp -s $src $out/share/java/jflap.jar 57 makeWrapper ${jre8}/bin/java $out/bin/jflap \ 58 - --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" \ 59 --add-flags "-jar $out/share/java/jflap.jar" 60 runHook postInstall 61 '';
··· 55 mkdir -p $out/share/java 56 cp -s $src $out/share/java/jflap.jar 57 makeWrapper ${jre8}/bin/java $out/bin/jflap \ 58 + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" \ 59 --add-flags "-jar $out/share/java/jflap.jar" 60 runHook postInstall 61 '';
+1 -1
pkgs/by-name/jo/josm/package.nix
··· 60 --add-flags "${baseJavaOpts} ${extraJavaOpts} -jar $out/share/josm/josm.jar" \ 61 --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' \ 62 --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ 63 - --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" 64 ''; 65 66 passthru = {
··· 60 --add-flags "${baseJavaOpts} ${extraJavaOpts} -jar $out/share/josm/josm.jar" \ 61 --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' \ 62 --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ 63 + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" 64 ''; 65 66 passthru = {
+1 -1
pkgs/by-name/ka/kamilalisp/package.nix
··· 24 cp ${src} $out/share/java/kamilalisp-${version}.jar 25 makeWrapper ${jre}/bin/java $out/bin/kamilalisp \ 26 --add-flags "-jar $out/share/java/kamilalisp-${version}.jar" \ 27 - --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=on' \ 28 --set _JAVA_AWT_WM_NONREPARENTING 1 29 ''; 30
··· 24 cp ${src} $out/share/java/kamilalisp-${version}.jar 25 makeWrapper ${jre}/bin/java $out/bin/kamilalisp \ 26 --add-flags "-jar $out/share/java/kamilalisp-${version}.jar" \ 27 + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" \ 28 --set _JAVA_AWT_WM_NONREPARENTING 1 29 ''; 30
+1 -1
pkgs/by-name/ne/netbeans/package.nix
··· 52 } \ 53 --prefix JAVA_HOME : ${jdk21.home} \ 54 --add-flags "--jdkhome ${jdk21.home} \ 55 - -J-Dawt.useSystemAAFontSettings=on -J-Dswing.aatext=true" 56 57 # Extract pngs from the Apple icon image and create 58 # the missing ones from the 1024x1024 image.
··· 52 } \ 53 --prefix JAVA_HOME : ${jdk21.home} \ 54 --add-flags "--jdkhome ${jdk21.home} \ 55 + -J-Dawt.useSystemAAFontSettings=gasp -J-Dswing.aatext=true" 56 57 # Extract pngs from the Apple icon image and create 58 # the missing ones from the 1024x1024 image.
+1 -1
pkgs/by-name/st/structorizer/package.nix
··· 85 install -D ${pname}.jar -t $out/share/java/ 86 makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ 87 --add-flags "-jar $out/share/java/${pname}.jar" \ 88 - --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=lcd' 89 90 cat << EOF > $out/share/mime/packages/structorizer.xml 91 <?xml version="1.0" encoding="UTF-8"?>
··· 85 install -D ${pname}.jar -t $out/share/java/ 86 makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ 87 --add-flags "-jar $out/share/java/${pname}.jar" \ 88 + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" 89 90 cat << EOF > $out/share/mime/packages/structorizer.xml 91 <?xml version="1.0" encoding="UTF-8"?>
+1 -1
pkgs/by-name/ti/tigerjython/package.nix
··· 87 --add-flags "-Duser.dir=$CUSTOM_LIBS/" \ 88 --add-flags "-Xmx512M" \ 89 --add-flags "-jar $JAR" \ 90 - --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=lcd' 91 92 runHook postInstall 93 '';
··· 87 --add-flags "-Duser.dir=$CUSTOM_LIBS/" \ 88 --add-flags "-Xmx512M" \ 89 --add-flags "-jar $JAR" \ 90 + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" 91 92 runHook postInstall 93 '';
+1 -1
pkgs/by-name/up/uppaal/package.nix
··· 64 makeWrapper $out/lib/uppaal/uppaal $out/bin/uppaal \ 65 --set JAVA_HOME ${jdk17} \ 66 --set PATH $out/lib/uppaal:$PATH \ 67 - --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd 68 69 runHook postInstall 70 '';
··· 64 makeWrapper $out/lib/uppaal/uppaal $out/bin/uppaal \ 65 --set JAVA_HOME ${jdk17} \ 66 --set PATH $out/lib/uppaal:$PATH \ 67 + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" 68 69 runHook postInstall 70 '';
+1 -1
pkgs/by-name/wo/workcraft/package.nix
··· 25 mkdir $out/bin 26 makeWrapper $out/share/workcraft $out/bin/workcraft \ 27 --set JAVA_HOME "${jre}" \ 28 - --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=gasp'; 29 ''; 30 31 meta = {
··· 25 mkdir $out/bin 26 makeWrapper $out/share/workcraft $out/bin/workcraft \ 27 --set JAVA_HOME "${jre}" \ 28 + --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"; 29 ''; 30 31 meta = {
+1 -1
pkgs/by-name/wp/wpcleaner/package.nix
··· 17 botScript = "$out/bin/wpcleaner-bot"; 18 runTaskScript = "$out/bin/wpcleaner-run-task"; 19 extraJavaArgs = [ 20 - "-Dawt.useSystemAAFontSettings=lcd" 21 "-Xms1g" 22 "-Xmx8g" 23 ];
··· 17 botScript = "$out/bin/wpcleaner-bot"; 18 runTaskScript = "$out/bin/wpcleaner-run-task"; 19 extraJavaArgs = [ 20 + "-Dawt.useSystemAAFontSettings=gasp" 21 "-Xms1g" 22 "-Xmx8g" 23 ];