public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2p: fix compilation

Browse Source 
- use system jdk instead of hardcoded openjdk
- remove backgrounding of service launcher
This commit is contained in:
Herwig Hochleitner 2015-04-15 21:14:02 +02:00
parent c6562348b8
commit 9754783b06
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/networking/i2p/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "i2p-0.9.19"; name = "i2p-0.9.19";
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
sha256 = "1q9sda1a708laxf452qnzbfv7bwfwyam5n1giw2n3z3ar602i936"; sha256 = "1q9sda1a708laxf452qnzbfv7bwfwyam5n1giw2n3z3ar602i936";
}; };
buildInputs = [ openjdk8 ant gettext ]; buildInputs = [ jdk ant gettext which ];
buildPhase = '' buildPhase = ''
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
ant preppkg-linux-only ant preppkg-linux-only
@ -22,7 +22,10 @@ stdenv.mkDerivation rec {
-e "s#/usr/bin/tr#${coreutils}/bin/tr#" \ -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \
-e 's#%USER_HOME#$HOME#' \ -e 's#%USER_HOME#$HOME#' \
-e "s#%SYSTEM_java_io_tmpdir#/tmp#" \ -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/runplain.sh $out/bin/i2prouter-plain
mv $out/man $out/share/ mv $out/man $out/share/
chmod +x $out/bin/* $out/i2psvc chmod +x $out/bin/* $out/i2psvc