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

Merge pull request #7613 from bendlas/i2p-fixes 

I2p: fix service
This commit is contained in:
Edward Tjörnhammar 2015-04-28 15:36:35 +02:00
parent f5bc58d733 9754783b06
commit 3d1db70761
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/module-list.nix
View File

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

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

@ -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 { stdenv.mkDerivation rec {
name = "i2p-0.9.18"; name = "i2p-0.9.19";
src = fetchurl { src = fetchurl {
url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; 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 = '' 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