From 275f961e91119b41d343933114d2161c21169c14 Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 2 Jun 2026 09:58:46 +0200 Subject: [PATCH 1/2] portfolio: use minimal JRE and drop bundled source artifacts --- pkgs/by-name/po/portfolio/package.nix | 30 +++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index e02b20928998..c445d9de9a4b 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -4,10 +4,11 @@ glib, glib-networking, gtk3, + jdk21_headless, + jre_minimal, lib, libsecret, makeDesktopItem, - openjdk21, stdenvNoCC, webkitgtk_4_1, wrapGAppsHook3, @@ -15,6 +16,26 @@ gitUpdater, }: let + jre = jre_minimal.override { + jdk = jdk21_headless; + modules = [ + "java.base" + "java.desktop" + "jdk.localedata" + "java.management" + "java.naming" + "java.net.http" + "java.security.jgss" + "java.sql" + "java.xml" + "jdk.crypto.ec" + "jdk.net" + "jdk.httpserver" + "jdk.unsupported" + "jdk.xml.dom" + ]; + }; + desktopItem = makeDesktopItem { name = "Portfolio"; exec = "portfolio"; @@ -89,9 +110,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { win32-x86-64\ } + # Eclipse source bundles are not needed at runtime. + rm -f $out/portfolio/plugins/*.source_*.jar + rm -rf $out/portfolio/configuration/org.eclipse.equinox.source + makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --prefix PATH : ${openjdk21}/bin + --prefix PATH : ${lib.makeBinPath [ jre ]} \ + --set JAVA_HOME "${jre}" # Create desktop item mkdir -p $out/share/applications From 10862a05ae10b860e16546b29a6142a4594771a3 Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 2 Jun 2026 11:39:38 +0200 Subject: [PATCH 2/2] portfolio: avoid double wrapping --- pkgs/by-name/po/portfolio/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index c445d9de9a4b..8d226c10fa24 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -69,6 +69,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { imagemagick ]; + dontWrapGApps = true; + dontConfigure = true; dontBuild = true; @@ -115,6 +117,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { rm -rf $out/portfolio/configuration/org.eclipse.equinox.source makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \ + "''${gappsWrapperArgs[@]}" \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ --prefix PATH : ${lib.makeBinPath [ jre ]} \ --set JAVA_HOME "${jre}"