From c158c5bc151aa666e6938dae4bae8043239d2b0f Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 19 Apr 2023 21:15:00 +0200 Subject: [PATCH] freenet: Reduce closure size Reduce the closure size from 1.0G to 174.7M. --- .../applications/networking/p2p/freenet/default.nix | 4 ++-- .../networking/p2p/freenet/freenetWrapper | 2 +- pkgs/top-level/all-packages.nix | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index c7a1a02fc241..8a46b5a476c1 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, jdk, gradle, bash, coreutils +{ lib, stdenv, fetchurl, fetchFromGitHub, jdk, jre, gradle, bash, coreutils , substituteAll, nixosTests, perl, fetchpatch, writeText }: let @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { wrapper = substituteAll { src = ./freenetWrapper; - inherit bash coreutils jdk seednodes; + inherit bash coreutils jre seednodes; }; # https://github.com/freenet/fred/blob/next/build-offline.sh diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper index f8292615de7a..74ff2c62961f 100755 --- a/pkgs/applications/networking/p2p/freenet/freenetWrapper +++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper @@ -15,4 +15,4 @@ cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref chmod u+rw -- $FREENET_HOME/seednodes.fref cd -- $FREENET_HOME -exec @jdk@/bin/java -Xmx1024M freenet.node.NodeStarter "$@" +exec @jre@/bin/java -Xmx1024M freenet.node.NodeStarter "$@" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dac8b735a293..2daf308d0642 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30495,6 +30495,19 @@ with pkgs; freenet = callPackage ../applications/networking/p2p/freenet { gradle = gradle_7; + jdk = jdk_headless; + # Reduce closure size + jre = pkgs.jre_minimal.override { + modules = [ + "java.base" + "java.logging" + "java.naming" + "java.sql" + "java.desktop" + "java.management" + ]; + jdk = jdk_headless; + }; }; freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { };