diff options
| author | Herwig Hochleitner <herwig@bendlas.net> | 2015-04-15 21:14:02 +0200 |
|---|---|---|
| committer | Herwig Hochleitner <herwig@bendlas.net> | 2015-04-28 15:17:58 +0200 |
| commit | 9754783b06597fc133b955ab3c360660aa9fd4dc (patch) | |
| tree | 0785bc6790f78e7b2cbdf1e6c35413756dd12e2c /pkgs/tools/networking/i2p | |
| parent | c6562348b830c6cf8695c39f0eea33ecc2fd5381 (diff) | |
| download | nixpkgs-9754783b06597fc133b955ab3c360660aa9fd4dc.tar nixpkgs-9754783b06597fc133b955ab3c360660aa9fd4dc.tar.gz nixpkgs-9754783b06597fc133b955ab3c360660aa9fd4dc.tar.bz2 nixpkgs-9754783b06597fc133b955ab3c360660aa9fd4dc.tar.lz nixpkgs-9754783b06597fc133b955ab3c360660aa9fd4dc.tar.xz nixpkgs-9754783b06597fc133b955ab3c360660aa9fd4dc.tar.zst nixpkgs-9754783b06597fc133b955ab3c360660aa9fd4dc.zip | |
i2p: fix compilation
- use system jdk instead of hardcoded openjdk - remove backgrounding of service launcher
Diffstat (limited to 'pkgs/tools/networking/i2p')
| -rw-r--r-- | pkgs/tools/networking/i2p/default.nix | 9 |
1 files 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 |