nzbhydra2: move to by-name
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchzip,
|
||||
makeWrapper,
|
||||
jre,
|
||||
openjdk17,
|
||||
python3,
|
||||
unzip,
|
||||
}:
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
jre
|
||||
openjdk17
|
||||
makeWrapper
|
||||
unzip
|
||||
];
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeWrapper ${python3}/bin/python $out/bin/nzbhydra2 \
|
||||
--add-flags "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py" \
|
||||
--prefix PATH ":" ${jre}/bin
|
||||
--prefix PATH ":" ${openjdk17}/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@@ -10945,11 +10945,6 @@ with pkgs;
|
||||
|
||||
nzbget = callPackage ../tools/networking/nzbget { };
|
||||
|
||||
nzbhydra2 = callPackage ../servers/nzbhydra2 {
|
||||
# Requires Java 17, not lower, not higher
|
||||
jre = openjdk17;
|
||||
};
|
||||
|
||||
oapi-codegen = callPackage ../tools/networking/oapi-codegen { };
|
||||
|
||||
oath-toolkit = callPackage ../tools/security/oath-toolkit { };
|
||||
|
||||
Reference in New Issue
Block a user