diff options
| author | Joel Moberg <joel.moberg@gmail.com> | 2015-04-15 12:59:25 +0200 |
|---|---|---|
| committer | Joel Moberg <joel.moberg@gmail.com> | 2015-04-15 17:09:46 +0200 |
| commit | e82a94f81617444758c852ebc394a5548f5fb787 (patch) | |
| tree | 76443acee383b71b07cf34195f403764f1acf8fb /pkgs/tools/networking/i2p | |
| parent | 5b075eb400e738635ddbcb2fbf46980d595e9249 (diff) | |
| download | nixlib-e82a94f81617444758c852ebc394a5548f5fb787.tar nixlib-e82a94f81617444758c852ebc394a5548f5fb787.tar.gz nixlib-e82a94f81617444758c852ebc394a5548f5fb787.tar.bz2 nixlib-e82a94f81617444758c852ebc394a5548f5fb787.tar.lz nixlib-e82a94f81617444758c852ebc394a5548f5fb787.tar.xz nixlib-e82a94f81617444758c852ebc394a5548f5fb787.tar.zst nixlib-e82a94f81617444758c852ebc394a5548f5fb787.zip | |
i2p: fix wrapper
Diffstat (limited to 'pkgs/tools/networking/i2p')
| -rw-r--r-- | pkgs/tools/networking/i2p/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 9f44a8d84a5e..0a26aff83dd1 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,4 +1,4 @@ -{ stdenv, procps, coreutils, fetchurl, openjdk8, ant, gcj, gettext }: +{ stdenv, procps, coreutils, fetchurl, openjdk8, openjre, ant, gcj, gettext }: stdenv.mkDerivation rec { name = "i2p-0.9.18"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; sha256 = "1hahdzvfh1zqb8qdc59xbjpqm8qq95k2xx22mpnhcdh90lb6xqnl"; }; - buildInputs = [ openjdk8 ant gcj gettext ]; + buildInputs = [ openjdk8 ant gettext ]; buildPhase = '' export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" ant preppkg-linux-only @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { -e "s#/usr/ucb/ps#${procps}/bin/ps#" \ -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \ -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#' mv $out/runplain.sh $out/bin/i2prouter-plain mv $out/man $out/share/ chmod +x $out/bin/* $out/i2psvc |