From 11e7a4161fc41c639567e6f76b39d74bffe4ce9c Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Wed, 20 Sep 2023 10:28:55 +0200
Subject: [PATCH 1/2] greenfoot: 3.7.1 -> 3.8.0

https://greenfoot.org/version_history

Also did some cleanup of the derivation to make it more like bluej (a very
closely related program).
---
 .../editors/greenfoot/default.nix             | 37 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  5 ++-
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix
index f7dc988de153..52d52a0785ee 100644
--- a/pkgs/applications/editors/greenfoot/default.nix
+++ b/pkgs/applications/editors/greenfoot/default.nix
@@ -1,31 +1,41 @@
-{ lib, stdenv, fetchurl, makeWrapper, jdk }:
+{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "greenfoot";
-  version = "3.7.1";
+  version = "3.8.0";
+
   src = fetchurl {
     # We use the deb here. First instinct might be to go for the "generic" JAR
     # download, but that is actually a graphical installer that is much harder
     # to unpack than the deb.
     url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${builtins.replaceStrings ["."] [""] version}.deb";
-    sha256 = "sha256-wGgKDsA/2luw+Nzs9dWb/HRHMx/0S0CFfoI53OCzxug=";
+    sha256 = "sha256-HDXmgLHS18VZVV+hCA0RgIrKRftOlV7t+fvE0pAHGjk=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ dpkg wrapGAppsHook ];
+  buildInputs = [ glib ];
 
-  unpackPhase = ''
-    ar xf $src
-    tar xf data.tar.xz
-  '';
+  dontWrapGApps = true;
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out
     cp -r usr/* $out
-    rm -r $out/share/greenfoot/jdk
-    rm -r $out/share/greenfoot/javafx
 
-    makeWrapper ${jdk}/bin/java $out/bin/greenfoot \
-      --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/greenfoot/bluej.jar\" bluej.Boot -greenfoot=true -bluej.compiler.showunchecked=false -greenfoot.scenarios=$out/share/doc/Greenfoot/scenarios -greenfoot.url.javadoc=file://$out/share/doc/Greenfoot/API"
+    rm -r $out/share/greenfoot/jdk
+    rm -r $out/share/greenfoot/javafx-*.jar
+
+    makeWrapper ${openjdk}/bin/java $out/bin/greenfoot \
+      "''${gappsWrapperArgs[@]}" \
+      --add-flags "-Dawt.useSystemAAFontSettings=on -Xmx512M \
+                   --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED \
+                   -cp $out/share/greenfoot/boot.jar bluej.Boot \
+                   -greenfoot=true -bluej.compiler.showunchecked=false \
+                   -greenfoot.scenarios=$out/share/doc/Greenfoot/scenarios \
+                   -greenfoot.url.javadoc=file://$out/share/doc/Greenfoot/API"
+
+    runHook postInstall
   '';
 
   meta = with lib; {
@@ -33,7 +43,8 @@ stdenv.mkDerivation rec {
     homepage = "https://www.greenfoot.org/";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.gpl2ClasspathPlus;
+    mainProgram = pname;
     maintainers = [ maintainers.chvp ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3dabd1bcd623..b89bf3df3340 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31670,7 +31670,10 @@ with pkgs;
   gpg-mdp = callPackage ../applications/misc/gpg-mdp { };
 
   greenfoot = callPackage ../applications/editors/greenfoot {
-    jdk = jetbrains.jdk;
+    openjdk = openjdk17.override {
+      enableJavaFX = true;
+      openjfx = openjfx17.override { withWebKit = true; };
+    };
   };
 
   gspeech = callPackage ../applications/audio/gspeech { };

From b60565ed4d41584adb62cf3ab2afee85bf6f8144 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Thu, 21 Sep 2023 09:56:14 +0200
Subject: [PATCH 2/2] bluej: use dpkg instead of manual preUnpackHook

---
 pkgs/applications/editors/bluej/default.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix
index ddcb002db5d1..a90cfba529fb 100644
--- a/pkgs/applications/editors/bluej/default.nix
+++ b/pkgs/applications/editors/bluej/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, openjdk, glib, wrapGAppsHook, zstd }:
+{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "bluej";
@@ -12,21 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-sOT86opMa9ytxJlfURIsD06HiP+j+oz3lQ0DqmLV1wE=";
   };
 
-  nativeBuildInputs = [ zstd wrapGAppsHook ];
+  nativeBuildInputs = [ dpkg wrapGAppsHook ];
   buildInputs = [ glib ];
 
-  sourceRoot = ".";
-
-  preUnpack = ''
-    unpackCmdHooks+=(_tryDebData)
-    _tryDebData() {
-      if ! [[ "$1" =~ \.deb$ ]]; then return 1; fi
-      ar xf $src
-      if ! [[ -e data.tar.zst ]]; then return 1; fi
-      unpackFile data.tar.zst
-    }
-  '';
-
   dontWrapGApps = true;
 
   installPhase = ''