diff options
| author | Edward Tjörnhammar <ed@cflags.cc> | 2015-04-28 15:36:35 +0200 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2015-04-28 15:36:35 +0200 |
| commit | 3d1db70761106aba93626d45927e7bd4280a7ef2 (patch) | |
| tree | 0785bc6790f78e7b2cbdf1e6c35413756dd12e2c | |
| parent | f5bc58d733e57e5887e3224de14fa12e44aca84f (diff) | |
| parent | 9754783b06597fc133b955ab3c360660aa9fd4dc (diff) | |
| download | nixlib-3d1db70761106aba93626d45927e7bd4280a7ef2.tar nixlib-3d1db70761106aba93626d45927e7bd4280a7ef2.tar.gz nixlib-3d1db70761106aba93626d45927e7bd4280a7ef2.tar.bz2 nixlib-3d1db70761106aba93626d45927e7bd4280a7ef2.tar.lz nixlib-3d1db70761106aba93626d45927e7bd4280a7ef2.tar.xz nixlib-3d1db70761106aba93626d45927e7bd4280a7ef2.tar.zst nixlib-3d1db70761106aba93626d45927e7bd4280a7ef2.zip | |
Merge pull request #7613 from bendlas/i2p-fixes
I2p: fix service
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/networking/i2p/default.nix | 13 |
2 files changed, 9 insertions, 5 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 023d67a01424..61cc551f4358 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -272,6 +272,7 @@ ./services/networking/haproxy.nix ./services/networking/hostapd.nix ./services/networking/i2pd.nix + ./services/networking/i2p.nix ./services/networking/ifplugd.nix ./services/networking/iodined.nix ./services/networking/ircd-hybrid/default.nix diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 9a20e009e58a..b5ef06c34eaa 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -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 { - name = "i2p-0.9.18"; + name = "i2p-0.9.19"; src = fetchurl { 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 = '' 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 |