From 9754783b06597fc133b955ab3c360660aa9fd4dc Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 15 Apr 2015 21:14:02 +0200
Subject: [PATCH] i2p: fix compilation

- use system jdk instead of hardcoded openjdk
- remove backgrounding of service launcher
---
 pkgs/tools/networking/i2p/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index 60dfd006776..b5ef06c34ea 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -1,4 +1,4 @@
-{ 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.19";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
     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