bluej: move to by-name, with lib; cleanup, RFC format (#356009)

This commit is contained in:
Aleksana 2024-11-29 16:25:57 +08:00 committed by GitHub
commit 130f661d36
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 16 deletions

View File

@ -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;
};
}

View File

@ -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;