BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #21581 from bendlas/update-i2p

Browse source 
i2p: 0.9.26 -> 0.9.28
This commit is contained in:
Michael Raskin 2017-01-02 14:15:10 +00:00 committed by GitHub
commit 6151982f58
2 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/networking/i2p/default.nix
View file

@ -1,10 +1,10 @@
{ stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
stdenv.mkDerivation rec {
name = "i2p-0.9.26";
name = "i2p-0.9.28";
src = fetchurl {
url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
sha256 = "0h672w69a5xzgcrls64bpss3ga9hgpnrq90dr5lb5912pwwq9pa1";
sha256 = "1xagyywnck2c5xalr7bc7cv5ikk4igf7avmc0n28nz9pkais1y1y";
};
buildInputs = [ jdk ant gettext which ];
patches = [ ./i2p.patch ];

34
pkgs/tools/networking/i2p/i2p.patch
View file

@ -1,6 +1,21 @@
diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
index 365737d89..2ea14db3e 100644
--- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter
@@ -49,7 +49,7 @@ APP_LONG_NAME="I2P Service"
# gettext - we look for it in the path
# fallback to echo is below, we can't set it to echo here.
-GETTEXT=$(which gettext > /dev/null 2>&1)
+GETTEXT=%gettext%
# Where to install the systemd service
SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service"
diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
index eb4995dfe..0186cede3 100644
--- a/installer/resources/runplain.sh
+++ b/installer/resources/runplain.sh
@@ -21,7 +21,7 @@
@@ -25,7 +25,7 @@ CP=
# Try using the Java binary that I2P was installed with.
# If it's not found, try looking in the system PATH.
@ -9,10 +24,10 @@
if [ -z $JAVA ] || [ ! -x $JAVA ]; then
echo "Error: Cannot find java." >&2
@@ -40,15 +40,4 @@
@@ -44,15 +44,4 @@ if [ $(uname -s) = "Darwin" ]; then
export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true"
fi
JAVAOPTS="-Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
JAVAOPTS="${MAXMEMOPT} -Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
-(
- nohup ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1
-) &
@ -25,15 +40,4 @@
- echo "I2P failed to start." >&2
- exit 1
-fi
+${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch
--- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter
@@ -49,7 +49,7 @@
# gettext - we look for it in the path
# fallback to echo is below, we can't set it to echo here.
-GETTEXT=$(which gettext > /dev/null 2>&1)
+GETTEXT=%gettext%
# Where to install the systemd service
SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service"
+exec ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch