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

i2p: wrapper: Fix 64bit build

Browse Source 
I didn't actually build this on 64bit, so let's see what Travis will do.
This commit is contained in:
shak-mar 2017-06-17 15:55:40 +02:00
parent eb8e289fad
commit e3f057d845
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,8 @@ let wrapper = stdenv.mkDerivation rec {
export JAVA_HOME=${jdk}/lib/openjdk/jre/ export JAVA_HOME=${jdk}/lib/openjdk/jre/
export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME
export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar
./build32.sh sed 's/ testsuite$//' -i src/c/Makefile-linux-x86-64.make
${if stdenv.isi686 then "./build32.sh" else "./build64.sh"}
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/{bin,lib} mkdir -p $out/{bin,lib}
@ -67,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" "i686-linux" ];
}; };
} }