Merge pull request #7613 from bendlas/i2p-fixes

I2p: fix service

nixos/modules/module-list.nix

@@ -272,6 +272,7 @@
   ./services/networking/haproxy.nix
   ./services/networking/hostapd.nix
   ./services/networking/i2pd.nix
+  ./services/networking/i2p.nix
   ./services/networking/ifplugd.nix
   ./services/networking/iodined.nix
   ./services/networking/ircd-hybrid/default.nix

pkgs/tools/networking/i2p/default.nix

@@ -1,12 +1,12 @@
-{ stdenv, procps, coreutils, fetchurl, openjdk8, openjre, ant, gcj, gettext }:
+{ stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
 
 stdenv.mkDerivation rec {
-  name = "i2p-0.9.18";
+  name = "i2p-0.9.19";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "1hahdzvfh1zqb8qdc59xbjpqm8qq95k2xx22mpnhcdh90lb6xqnl";
+    sha256 = "1q9sda1a708laxf452qnzbfv7bwfwyam5n1giw2n3z3ar602i936";
   };
-  buildInputs = [ openjdk8 ant gettext ];
+  buildInputs = [ jdk ant gettext which ];
   buildPhase = ''
     export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
     ant preppkg-linux-only
@@ -22,7 +22,10 @@ stdenv.mkDerivation rec {
       -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \
       -e 's#%USER_HOME#$HOME#' \
       -e "s#%SYSTEM_java_io_tmpdir#/tmp#" \
-      -e 's#JAVA=java#JAVA=${openjre}/bin/java#'
+      -e 's#JAVA=java#JAVA=${jre}/bin/java#'
+    sed -i $out/runplain.sh \
+      -e "s#nohup \(.*Launch\) .*#\1#" \
+      -e "s#echo \$\! .*##"
     mv $out/runplain.sh $out/bin/i2prouter-plain
     mv $out/man $out/share/
     chmod +x $out/bin/* $out/i2psvc