dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #228386 from nagy/freenet-closure

Browse Source
This commit is contained in:
Sandro 2023-04-27 20:40:50 +02:00 committed by GitHub
commit 0bc6088945
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/p2p/freenet/default.nix
View File

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

2
pkgs/applications/networking/p2p/freenet/freenetWrapper
View File

@ -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 "$@"

13
pkgs/top-level/all-packages.nix
View File

@ -30499,6 +30499,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 { };