diff options
| author | shak-mar <shakmar@openmailbox.org> | 2017-06-17 15:55:40 +0200 |
|---|---|---|
| committer | shak-mar <shakmar@openmailbox.org> | 2017-06-17 16:25:17 +0200 |
| commit | e3f057d84586d3011e434fbcfb2d6b2048aa8918 (patch) | |
| tree | 5385819f02b2d1ca67d199ebf24a14502fc8c56d /pkgs/tools/networking/i2p | |
| parent | eb8e289fad6a1ce1436afc7dd3816aa1e0edf178 (diff) | |
| download | nixpkgs-e3f057d84586d3011e434fbcfb2d6b2048aa8918.tar nixpkgs-e3f057d84586d3011e434fbcfb2d6b2048aa8918.tar.gz nixpkgs-e3f057d84586d3011e434fbcfb2d6b2048aa8918.tar.bz2 nixpkgs-e3f057d84586d3011e434fbcfb2d6b2048aa8918.tar.lz nixpkgs-e3f057d84586d3011e434fbcfb2d6b2048aa8918.tar.xz nixpkgs-e3f057d84586d3011e434fbcfb2d6b2048aa8918.tar.zst nixpkgs-e3f057d84586d3011e434fbcfb2d6b2048aa8918.zip | |
i2p: wrapper: Fix 64bit build
I didn't actually build this on 64bit, so let's see what Travis will do.
Diffstat (limited to 'pkgs/tools/networking/i2p')
| -rw-r--r-- | pkgs/tools/networking/i2p/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index b20b98eccbf..e13ada5994c 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -13,7 +13,8 @@ let wrapper = stdenv.mkDerivation rec { export JAVA_HOME=${jdk}/lib/openjdk/jre/ export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME 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 = '' mkdir -p $out/{bin,lib} @@ -67,7 +68,6 @@ stdenv.mkDerivation rec { description = "Applications and router for I2P, anonymity over the Internet"; maintainers = [ maintainers.joelmo ]; license = licenses.gpl2; - # TODO: support other systems, just copy appropriate lib/wrapper.. to $out platforms = [ "x86_64-linux" "i686-linux" ]; }; } |