From 22ef72420a461b9947ed595df0297b59e8738062 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Sat, 7 Sep 2024 12:00:00 +0200
Subject: [PATCH] freenet: fix build

---
 .../networking/p2p/freenet/default.nix        | 21 +++++++++++++------
 .../networking/p2p/freenet/freenetWrapper     |  5 ++---
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix
index ff0b449cafd0..0a46a6095489 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@@ -22,9 +22,15 @@ let
     sha256 = "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158=";
   };
 
-  seednodes = fetchurl {
-    url = "https://downloads.freenetproject.org/alpha/opennet/seednodes.fref";
-    sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv";
+  seednodes = fetchFromGitHub {
+    name = "freenet-seednodes";
+    owner = "hyphanet";
+    repo = "seedrefs";
+    rev = "9df1bf93ab64aba634bdfc5f4d0e960571ce4ba5";
+    hash = "sha256-nvwJvKw5IPhItPe4k/jnOGaa8H4DtOi8XxKFOKFMAuY=";
+    postFetch = ''
+      cat $out/* > $out/seednodes.fref
+    '';
   };
 
   patches = [
@@ -81,12 +87,15 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    install -Dm444 build/libs/freenet.jar $out/share/freenet/freenet.jar
+
+    install -Dm644 build/libs/freenet.jar $out/share/freenet/freenet.jar
     ln -s ${freenet_ext} $out/share/freenet/freenet-ext.jar
     mkdir -p $out/bin
-    install -Dm555 ${wrapper} $out/bin/freenet
+    install -Dm755 ${wrapper} $out/bin/freenet
+    export CLASSPATH="$(find ${mitmCache} -name "*.jar"| sort | grep -v bcprov-jdk15on-1.48.jar|tr $'\n' :):$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar"
     substituteInPlace $out/bin/freenet \
-      --subst-var-by outFreenet $out
+      --subst-var-by CLASSPATH "$CLASSPATH"
+
     runHook postInstall
   '';
 
diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper
index 74ff2c62961f..5e4e43d08a1b 100755
--- a/pkgs/applications/networking/p2p/freenet/freenetWrapper
+++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper
@@ -1,8 +1,7 @@
 #! @bash@/bin/bash
 set -eo pipefail
 PATH=@coreutils@/bin:$PATH
-export CLASSPATH=$(find @outFreenet@/deps/ -name "*.jar"|grep -v bcprov-jdk15on-1.48.jar|tr $'\n' :)
-CLASSPATH=$CLASSPATH:@outFreenet@/share/freenet/freenet-ext.jar:@outFreenet@/share/freenet/freenet.jar
+export CLASSPATH=@CLASSPATH@
 
 export FREENET_HOME="$HOME/.local/share/freenet"
 if [ -n "$XDG_DATA_HOME" ] ; then
@@ -11,7 +10,7 @@ fi
 
 mkdir -p -- $FREENET_HOME
 
-cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref
+cp -u -- @seednodes@/seednodes.fref $FREENET_HOME/seednodes.fref
 chmod u+rw -- $FREENET_HOME/seednodes.fref
 
 cd -- $FREENET_HOME