diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/by-name/bl/bluej/package.nix similarity index 63% rename from pkgs/applications/editors/bluej/default.nix rename to pkgs/by-name/bl/bluej/package.nix index 802bc15fc583..52e46d1f30fd 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/by-name/bl/bluej/package.nix @@ -1,5 +1,19 @@ -{ 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"; @@ -8,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; @@ -36,13 +55,14 @@ 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; }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 889c6f68bd67..d90d34584a80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13433,13 +13433,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 { }; breezy = with python3Packages; toPythonApplication breezy;