From a31330d5a468ffe3d637cef92c99b796879e09fb Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Sat, 22 Nov 2025 15:55:43 +0100 Subject: [PATCH 1/4] processing: 4.3.2 -> 4.4.6 --- pkgs/by-name/pr/processing/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/processing/package.nix b/pkgs/by-name/pr/processing/package.nix index 7f595dc48c56..8e54914698e4 100644 --- a/pkgs/by-name/pr/processing/package.nix +++ b/pkgs/by-name/pr/processing/package.nix @@ -17,7 +17,7 @@ }: let jdk = jdk17; - buildNumber = "1295"; + buildNumber = "1306"; vaqua = fetchurl { name = "VAqua9.jar"; url = "https://violetlib.org/release/vaqua/9/VAqua9.jar"; @@ -62,13 +62,13 @@ let in stdenv.mkDerivation rec { pname = "processing"; - version = "4.3.2"; + version = "4.4.6"; src = fetchFromGitHub { owner = "processing"; repo = "processing4"; rev = "processing-${buildNumber}-${version}"; - sha256 = "sha256-jUkWnkP8up5vpaXfgFJ/jQjN1KfeX5EuYXSb+W6NEms="; + sha256 = "sha256-dqBJeDnQEDDJ1TAZqwbPU8Arsecf9iv1T311bFIBO4w="; }; # Processing did not update the todo.txt file before tagging this release, so @@ -98,8 +98,8 @@ stdenv.mkDerivation rec { echo "tarring jdk" tar --checkpoint=10000 -czf build/linux/jdk-17.0.8-${arch}.tgz ${jdk} + mkdir -p app/lib core/library cp ${ant.home}/lib/{ant.jar,ant-launcher.jar} app/lib/ - mkdir -p core/library ln -s ${jogl}/share/java/* core/library/ ln -s ${vaqua} app/lib/VAqua9.jar ln -s ${flatlaf} app/lib/flatlaf.jar From c57e3b5b3f05585343085d2ec91bbf3f257b1ca5 Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Sun, 23 Nov 2025 11:25:11 +0100 Subject: [PATCH 2/4] processing: 4.4.6 -> 4.4.10 --- .../by-name/pr/processing/fix-ant-build.patch | 80 +++++++++++++++++++ pkgs/by-name/pr/processing/package.nix | 11 ++- 2 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/pr/processing/fix-ant-build.patch diff --git a/pkgs/by-name/pr/processing/fix-ant-build.patch b/pkgs/by-name/pr/processing/fix-ant-build.patch new file mode 100644 index 000000000000..3c471262873a --- /dev/null +++ b/pkgs/by-name/pr/processing/fix-ant-build.patch @@ -0,0 +1,80 @@ +diff --git a/app/build.xml b/app/build.xml +index 37aa13d03..a495b4f7e 100644 +--- a/app/build.xml ++++ b/app/build.xml +@@ -162,6 +162,7 @@ + encoding="UTF-8" + includeAntRuntime="false" + classpath="../core/library/core.jar; ++ utils/library/utils.jar; + lib/ant.jar; + lib/ant-launcher.jar; + lib/flatlaf.jar; +diff --git a/app/utils/build.xml b/app/utils/build.xml +new file mode 100644 +index 000000000..5a4b72e32 +--- /dev/null ++++ b/app/utils/build.xml +@@ -0,0 +1,22 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/build/build.xml b/build/build.xml +index f1247b511..2f1f22128 100644 +--- a/build/build.xml ++++ b/build/build.xml +@@ -191,6 +191,7 @@ + + + ++ + + + +@@ -294,6 +295,7 @@ + + + ++ + + + +@@ -315,6 +317,7 @@ + + + ++ + + + +diff --git a/java/build.xml b/java/build.xml +index ca2e32f4f..5aeae7ac8 100644 +--- a/java/build.xml ++++ b/java/build.xml +@@ -97,6 +97,7 @@ + + + ++ + + + diff --git a/pkgs/by-name/pr/processing/package.nix b/pkgs/by-name/pr/processing/package.nix index 8e54914698e4..01573a7ab31a 100644 --- a/pkgs/by-name/pr/processing/package.nix +++ b/pkgs/by-name/pr/processing/package.nix @@ -17,7 +17,7 @@ }: let jdk = jdk17; - buildNumber = "1306"; + buildNumber = "1310"; vaqua = fetchurl { name = "VAqua9.jar"; url = "https://violetlib.org/release/vaqua/9/VAqua9.jar"; @@ -62,18 +62,21 @@ let in stdenv.mkDerivation rec { pname = "processing"; - version = "4.4.6"; + version = "4.4.10"; src = fetchFromGitHub { owner = "processing"; repo = "processing4"; rev = "processing-${buildNumber}-${version}"; - sha256 = "sha256-dqBJeDnQEDDJ1TAZqwbPU8Arsecf9iv1T311bFIBO4w="; + sha256 = "sha256-u2wQl/VGCNJPd+k3DX2eW7gkA/RARMTSNGcoQuS/Oh8="; }; # Processing did not update the todo.txt file before tagging this release, so # the "revision-check" Ant target fails. - patches = [ ./disable-revision-check.patch ]; + patches = [ + ./disable-revision-check.patch + ./fix-ant-build.patch + ]; nativeBuildInputs = [ ant From 6831ca6f110612eb07299d536683ec398c5e00cf Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Mon, 24 Nov 2025 11:22:36 +0100 Subject: [PATCH 3/4] processing: Drop patch that is no longer necessary --- .../pr/processing/disable-revision-check.patch | 13 ------------- pkgs/by-name/pr/processing/package.nix | 7 +------ 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 pkgs/by-name/pr/processing/disable-revision-check.patch diff --git a/pkgs/by-name/pr/processing/disable-revision-check.patch b/pkgs/by-name/pr/processing/disable-revision-check.patch deleted file mode 100644 index 3a0abbcb8339..000000000000 --- a/pkgs/by-name/pr/processing/disable-revision-check.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/build.xml b/build/build.xml -index 8ad556c11..e61b6ae45 100644 ---- a/build/build.xml -+++ b/build/build.xml -@@ -453,8 +453,6 @@ - - -- - - - diff --git a/pkgs/by-name/pr/processing/package.nix b/pkgs/by-name/pr/processing/package.nix index 01573a7ab31a..247edf91a898 100644 --- a/pkgs/by-name/pr/processing/package.nix +++ b/pkgs/by-name/pr/processing/package.nix @@ -71,12 +71,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-u2wQl/VGCNJPd+k3DX2eW7gkA/RARMTSNGcoQuS/Oh8="; }; - # Processing did not update the todo.txt file before tagging this release, so - # the "revision-check" Ant target fails. - patches = [ - ./disable-revision-check.patch - ./fix-ant-build.patch - ]; + patches = [ ./fix-ant-build.patch ]; nativeBuildInputs = [ ant From f71ad2040c45f17558dc7748422f983ce8162315 Mon Sep 17 00:00:00 2001 From: Evan Goode Date: Wed, 26 Nov 2025 00:22:28 -0500 Subject: [PATCH 4/4] processing: make wrappers in preFixup, not installPhase If we create the wrappers before preFixup, gappsWrapperArgs will not have been fully populated yet and we don't get the $XDG_DATA_DIRS added to the wrapper, leading to a "No GSettings schemas are installed on the system" when opening the Open file dialog --- pkgs/by-name/pr/processing/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/processing/package.nix b/pkgs/by-name/pr/processing/package.nix index 247edf91a898..7a9f8c77931b 100644 --- a/pkgs/by-name/pr/processing/package.nix +++ b/pkgs/by-name/pr/processing/package.nix @@ -127,16 +127,18 @@ stdenv.mkDerivation rec { cp -dpr build/linux/work $out/share/${pname} rmdir $out/share/${pname}/java ln -s ${jdk} $out/share/${pname}/java + runHook postInstall + ''; + + preFixup = '' makeWrapper $out/share/${pname}/processing $out/bin/processing \ - ''${gappsWrapperArgs[@]} \ + "''${gappsWrapperArgs[@]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" makeWrapper $out/share/${pname}/processing-java $out/bin/processing-java \ - ''${gappsWrapperArgs[@]} \ + "''${gappsWrapperArgs[@]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" - - runHook postInstall ''; meta = with lib; {