From 780c0bbdeaedec7976ccdd73083f57d174dc3e73 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m@matteopacini.me>
Date: Thu, 14 Nov 2024 21:56:23 +0000
Subject: [PATCH 1/3] bluej: move to pkgs/by-name

---
 .../bluej/default.nix => by-name/bl/bluej/package.nix}   | 9 +++++++--
 pkgs/top-level/all-packages.nix                          | 7 -------
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename pkgs/{applications/editors/bluej/default.nix => by-name/bl/bluej/package.nix} (87%)

diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/by-name/bl/bluej/package.nix
similarity index 87%
rename from pkgs/applications/editors/bluej/default.nix
rename to pkgs/by-name/bl/bluej/package.nix
index 802bc15fc583..0f7d43717e23 100644
--- a/pkgs/applications/editors/bluej/default.nix
+++ b/pkgs/by-name/bl/bluej/package.nix
@@ -1,5 +1,10 @@
-{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook3 }:
-
+{ lib, stdenv, fetchurl, openjdk17, openjfx17, glib, dpkg, wrapGAppsHook3 }:
+let
+  openjdk = openjdk17.override {
+      enableJavaFX = true;
+      openjfx_jdk = openjfx17.override { withWebKit = true; };
+  };
+in
 stdenv.mkDerivation rec {
   pname = "bluej";
   version = "5.2.0";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89a2923133ad..db4cc3be9740 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13596,13 +13596,6 @@ with pkgs;
     gtk = gtk3;
   };
 
-  bluej = callPackage ../applications/editors/bluej {
-    openjdk = openjdk17.override {
-      enableJavaFX = true;
-      openjfx_jdk = openjfx17.override { withWebKit = true; };
-    };
-  };
-
   bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { };
 
   bottles = callPackage ../applications/misc/bottles/fhsenv.nix { };

From 8bc4908f5c36bb62c23e12906fd5f3af4750454c Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m@matteopacini.me>
Date: Thu, 14 Nov 2024 21:57:13 +0000
Subject: [PATCH 2/3] bluej: with lib; cleanup

---
 pkgs/by-name/bl/bluej/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bl/bluej/package.nix b/pkgs/by-name/bl/bluej/package.nix
index 0f7d43717e23..15fa93ade6fb 100644
--- a/pkgs/by-name/bl/bluej/package.nix
+++ b/pkgs/by-name/bl/bluej/package.nix
@@ -41,13 +41,13 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple integrated development environment for Java";
     homepage = "https://www.bluej.org/";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.gpl2ClasspathPlus;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.gpl2ClasspathPlus;
     mainProgram = "bluej";
-    maintainers = with maintainers; [ chvp ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ chvp ];
+    platforms = lib.platforms.linux;
   };
 }

From 74458684bdc16dfbfb9e1091cba0b83bf227f3ea Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m@matteopacini.me>
Date: Thu, 14 Nov 2024 21:58:18 +0000
Subject: [PATCH 3/3] bluej: nixfmt-rfc-style

---
 pkgs/by-name/bl/bluej/package.nix | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bl/bluej/package.nix b/pkgs/by-name/bl/bluej/package.nix
index 15fa93ade6fb..52e46d1f30fd 100644
--- a/pkgs/by-name/bl/bluej/package.nix
+++ b/pkgs/by-name/bl/bluej/package.nix
@@ -1,8 +1,17 @@
-{ lib, stdenv, fetchurl, openjdk17, openjfx17, glib, dpkg, wrapGAppsHook3 }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  openjdk17,
+  openjfx17,
+  glib,
+  dpkg,
+  wrapGAppsHook3,
+}:
 let
   openjdk = openjdk17.override {
-      enableJavaFX = true;
-      openjfx_jdk = openjfx17.override { withWebKit = true; };
+    enableJavaFX = true;
+    openjfx_jdk = openjfx17.override { withWebKit = true; };
   };
 in
 stdenv.mkDerivation rec {
@@ -13,11 +22,16 @@ stdenv.mkDerivation rec {
     # 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.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb";
+    url = "https://www.bluej.org/download/files/BlueJ-linux-${
+      builtins.replaceStrings [ "." ] [ "" ] version
+    }.deb";
     sha256 = "sha256-sOT86opMa9ytxJlfURIsD06HiP+j+oz3lQ0DqmLV1wE=";
   };
 
-  nativeBuildInputs = [ dpkg wrapGAppsHook3 ];
+  nativeBuildInputs = [
+    dpkg
+    wrapGAppsHook3
+  ];
   buildInputs = [ glib ];
 
   dontWrapGApps = true;
@@ -50,4 +64,5 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ chvp ];
     platforms = lib.platforms.linux;
   };
+
 }