pyrox.dev
i2p: 0.9.26 -> 0.9.28
update patch
+2
-2
pkgs/tools/networking/i2p/default.nix
+2
-2
pkgs/tools/networking/i2p/default.nix
···
1
1
{ stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
2
2
3
3
stdenv.mkDerivation rec {
4
-
name = "i2p-0.9.26";
4
+
name = "i2p-0.9.28";
5
5
src = fetchurl {
6
6
url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
7
-
sha256 = "0h672w69a5xzgcrls64bpss3ga9hgpnrq90dr5lb5912pwwq9pa1";
7
+
sha256 = "1xagyywnck2c5xalr7bc7cv5ikk4igf7avmc0n28nz9pkais1y1y";
8
8
};
9
9
buildInputs = [ jdk ant gettext which ];
10
10
patches = [ ./i2p.patch ];
+19
-15
pkgs/tools/networking/i2p/i2p.patch
+19
-15
pkgs/tools/networking/i2p/i2p.patch
···
1
+
diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
2
+
index 365737d89..2ea14db3e 100644
3
+
--- a/installer/resources/i2prouter
4
+
+++ b/installer/resources/i2prouter
5
+
@@ -49,7 +49,7 @@ APP_LONG_NAME="I2P Service"
6
+
7
+
# gettext - we look for it in the path
8
+
# fallback to echo is below, we can't set it to echo here.
9
+
-GETTEXT=$(which gettext > /dev/null 2>&1)
10
+
+GETTEXT=%gettext%
11
+
12
+
# Where to install the systemd service
13
+
SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service"
14
+
diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
15
+
index eb4995dfe..0186cede3 100644
1
16
--- a/installer/resources/runplain.sh
2
17
+++ b/installer/resources/runplain.sh
3
-
@@ -21,7 +21,7 @@
18
+
@@ -25,7 +25,7 @@ CP=
4
19
5
20
# Try using the Java binary that I2P was installed with.
6
21
# If it's not found, try looking in the system PATH.
···
9
24
10
25
if [ -z $JAVA ] || [ ! -x $JAVA ]; then
11
26
echo "Error: Cannot find java." >&2
12
-
@@ -40,15 +40,4 @@
27
+
@@ -44,15 +44,4 @@ if [ $(uname -s) = "Darwin" ]; then
13
28
export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true"
14
29
fi
15
-
JAVAOPTS="-Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
30
+
JAVAOPTS="${MAXMEMOPT} -Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
16
31
-(
17
32
- nohup ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1
18
33
-) &
···
25
40
- echo "I2P failed to start." >&2
26
41
- exit 1
27
42
-fi
28
-
+${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch
29
-
--- a/installer/resources/i2prouter
30
-
+++ b/installer/resources/i2prouter
31
-
@@ -49,7 +49,7 @@
32
-
33
-
# gettext - we look for it in the path
34
-
# fallback to echo is below, we can't set it to echo here.
35
-
-GETTEXT=$(which gettext > /dev/null 2>&1)
36
-
+GETTEXT=%gettext%
37
-
38
-
# Where to install the systemd service
39
-
SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service"
43
+
+exec ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch