bluej: 5.0.3 -> 5.1.0

https://bluej.org/versions.html
This commit is contained in:
Charlotte Van Petegem 2023-05-17 11:45:16 +02:00
parent cf69135539
commit ef8929e62c
No known key found for this signature in database
GPG key ID: 019E764B7184435A
2 changed files with 18 additions and 24 deletions

View file

@ -1,21 +1,22 @@
{ lib, stdenv, fetchurl, jdk, glib, wrapGAppsHook }: { lib, stdenv, fetchurl, openjdk, glib, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bluej"; pname = "bluej";
version = "5.0.3"; version = "5.1.0";
src = fetchurl { src = fetchurl {
# We use the deb here. First instinct might be to go for the "generic" JAR # 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 # download, but that is actually a graphical installer that is much harder
# to unpack than the deb. # 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-OarqmptxZc7xEEYeoCVqHXkAvfzfSYx5nUp/iWPyoqw="; sha256 = "sha256-tOb15wU9OjUt0D8l/JkaGYj84L7HV4FUnQQB5cRAxG0=";
}; };
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];
buildInputs = [ glib ]; buildInputs = [ glib ];
sourceRoot = "."; sourceRoot = ".";
preUnpack = '' preUnpack = ''
unpackCmdHooks+=(_tryDebData) unpackCmdHooks+=(_tryDebData)
_tryDebData() { _tryDebData() {
@ -26,39 +27,29 @@ stdenv.mkDerivation rec {
} }
''; '';
dontWrapGApps = true;
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
if [ -n "$prefix" ]; then mkdir -p $out
mkdir -p "$prefix" cp -r usr/* $out
fi
mkdir -p "$out" makeWrapper ${openjdk}/bin/java $out/bin/bluej \
"''${gappsWrapperArgs[@]}" \
if shopt -q dotglob; then dotglobOpt=$?; else dotglobOpt=$?; fi --add-flags "-Dawt.useSystemAAFontSettings=on -Xmx512M \
shopt -s dotglob --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED \
for file in usr/*; do -jar $out/share/bluej/bluej.jar"
cp -R "$file" "$out"
done
if (( !dotglobOpt )); then shopt -u dotglob; fi
runHook postInstall runHook postInstall
''; '';
dontWrapGApps = true;
preFixup = ''
makeWrapper ${jdk}/bin/java $out/bin/bluej \
"''${gappsWrapperArgs[@]}" \
--add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp $out/share/bluej/bluej.jar bluej.Boot"
'';
meta = with lib; { meta = with lib; {
description = "A simple integrated development environment for Java"; description = "A simple integrated development environment for Java";
homepage = "https://www.bluej.org/"; homepage = "https://www.bluej.org/";
sourceProvenance = with sourceTypes; [ binaryBytecode ]; sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.gpl2ClasspathPlus; license = licenses.gpl2ClasspathPlus;
maintainers = with maintainers; [ chvp ]; maintainers = with maintainers; [ chvp ];
platforms = platforms.unix; platforms = platforms.linux;
}; };
} }

View file

@ -29434,7 +29434,10 @@ with pkgs;
}; };
bluej = callPackage ../applications/editors/bluej { bluej = callPackage ../applications/editors/bluej {
jdk = jetbrains.jdk; openjdk = openjdk17.override {
enableJavaFX = true;
openjfx = openjfx17.override { withWebKit = true; };
};
}; };
bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { }; bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { };