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] 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 { };