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

Merge pull request #26662 from shak-mar/i2p-0.9.30-i686

Browse Source 
i2p: 0.9.28 -> 0.9.30 (and build wrapper from source) (and for 32bit)
This commit is contained in:
Michael Raskin 2017-07-14 09:48:05 +02:00 committed by GitHub
commit 1dca35c6b4
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,36 @@
{ stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: { stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
let wrapper = stdenv.mkDerivation rec {
name = "wrapper-${version}";
version = "3.5.32";
src = fetchurl {
url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
sha256 = "1v388p5jjbpwybw0zjv5glzny17fwdwppaci2lqcsnm6qw0667f1";
};
buildInputs = [ jdk ];
buildPhase = ''
export ANT_HOME=${ant}
export JAVA_HOME=${jdk}/lib/openjdk/jre/
export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME
export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar
sed 's/ testsuite$//' -i src/c/Makefile-linux-x86-64.make
${if stdenv.isi686 then "./build32.sh" else "./build64.sh"}
'';
installPhase = ''
mkdir -p $out/{bin,lib}
cp bin/wrapper $out/bin/wrapper
cp lib/wrapper.jar $out/lib/wrapper.jar
cp lib/libwrapper.so $out/lib/libwrapper.so
'';
};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "i2p-0.9.28"; name = "i2p-0.9.30";
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 = "1xagyywnck2c5xalr7bc7cv5ikk4igf7avmc0n28nz9pkais1y1y"; sha256 = "03hrirmah3ba9ygql487jy233nsxkfjyz82mmyppazi0mcgiass1";
}; };
buildInputs = [ jdk ant gettext which ]; buildInputs = [ jdk ant gettext which ];
patches = [ ./i2p.patch ]; patches = [ ./i2p.patch ];
@ -16,7 +42,11 @@ stdenv.mkDerivation rec {
set -B set -B
mkdir -p $out/{bin,share} mkdir -p $out/{bin,share}
cp -r pkg-temp/* $out cp -r pkg-temp/* $out
cp installer/lib/wrapper/linux64/* $out
cp ${wrapper}/bin/wrapper $out/i2psvc
cp ${wrapper}/lib/wrapper.jar $out/lib
cp ${wrapper}/lib/libwrapper.so $out/lib
sed -i $out/i2prouter -i $out/runplain.sh \ sed -i $out/i2prouter -i $out/runplain.sh \
-e "s#uname#${coreutils}/bin/uname#" \ -e "s#uname#${coreutils}/bin/uname#" \
-e "s#which#${which}/bin/which#" \ -e "s#which#${which}/bin/which#" \
@ -38,7 +68,6 @@ stdenv.mkDerivation rec {
description = "Applications and router for I2P, anonymity over the Internet"; description = "Applications and router for I2P, anonymity over the Internet";
maintainers = [ maintainers.joelmo ]; maintainers = [ maintainers.joelmo ];
license = licenses.gpl2; license = licenses.gpl2;
# TODO: support other systems, just copy appropriate lib/wrapper.. to $out platforms = [ "x86_64-linux" "i686-linux" ];
platforms = [ "x86_64-linux" ];
}; };
} }