ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

i2p: get rid of duplicate Java Service Wrapper

Browse Source 
The definition of Java Service Wrapper in i2p is identical to the java-service-wrapper package except that the latter also executes the test suite, which requires some extra dependencies.
The java-service-wrapper package was actually added in https://github.com/NixOS/nixpkgs/pull/67824 to move the definition from the i2p package into a separate package. While it was added as a separate package, it was never removed from i2p. This commit fixes that.
This commit is contained in:
Luflosi 2021-08-17 13:14:26 +02:00
parent 3bf3a0ce4c
commit 5ffdc31f62
No known key found for this signature in database
GPG Key ID: 4E41E29EDCC345D0
1 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,34 +1,4 @@
{ lib, stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
let wrapper = stdenv.mkDerivation rec {
pname = "wrapper";
version = "3.5.46";
src = fetchurl {
url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
sha256 = "sha256-guHQyFSI0TidAuOr4zWaf3WRGeNW4+Or1sbWdhWuWtg=";
};
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
{ lib, stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which, java-service-wrapper }:
stdenv.mkDerivation rec {
pname = "i2p";
@ -52,9 +22,9 @@ stdenv.mkDerivation rec {
mkdir -p $out/{bin,share}
cp -r pkg-temp/* $out
cp ${wrapper}/bin/wrapper $out/i2psvc
cp ${wrapper}/lib/wrapper.jar $out/lib
cp ${wrapper}/lib/libwrapper.so $out/lib
cp ${java-service-wrapper}/bin/wrapper $out/i2psvc
cp ${java-service-wrapper}/lib/wrapper.jar $out/lib
cp ${java-service-wrapper}/lib/libwrapper.so $out/lib
sed -i $out/i2prouter -i $out/runplain.sh \
-e "s#uname#${coreutils}/bin/uname#" \