From 3f286091233c67bb53d816bc2a7d73a104497574 Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Sun, 4 Aug 2024 14:43:50 +1000
Subject: [PATCH] netbeans: moved to by-name

---
 .../default.nix => by-name/ne/netbeans/package.nix}       | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/editors/netbeans/default.nix => by-name/ne/netbeans/package.nix} (93%)

diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/by-name/ne/netbeans/package.nix
similarity index 93%
rename from pkgs/applications/editors/netbeans/default.nix
rename to pkgs/by-name/ne/netbeans/package.nix
index df5fbc3fcae3..cfd9e0ae7d46 100644
--- a/pkgs/applications/editors/netbeans/default.nix
+++ b/pkgs/by-name/ne/netbeans/package.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, which, unzip, libicns, imagemagick
-, jdk, perl
+, jdk17, perl
 }:
 
 let
@@ -34,9 +34,9 @@ stdenv.mkDerivation {
     mkdir -pv $out/bin
     cp -a netbeans $out
     makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
-      --prefix PATH : ${lib.makeBinPath [ jdk which ]} \
-      --prefix JAVA_HOME : ${jdk.home} \
-      --add-flags "--jdkhome ${jdk.home} \
+      --prefix PATH : ${lib.makeBinPath [ jdk17 which ]} \
+      --prefix JAVA_HOME : ${jdk17.home} \
+      --add-flags "--jdkhome ${jdk17.home} \
       -J-Dawt.useSystemAAFontSettings=on -J-Dswing.aatext=true"
 
     # Extract pngs from the Apple icon image and create
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f8b3ffc2685..f772af07afc3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31836,10 +31836,6 @@ with pkgs;
 
   nanorc = callPackage ../applications/editors/nano/nanorc { };
 
-  netbeans = callPackage ../applications/editors/netbeans {
-    jdk = jdk17;
-  };
-
   netcoredbg = callPackage ../development/tools/misc/netcoredbg { };
 
   ncdu = callPackage ../tools/misc/ncdu {