neo4j: Clean up and make jre easy to override

Convention is to use `jre` and make it specific in the callPackage
call.
This way users can override it regardless of changes to the default
neo4j jre.
This commit is contained in:
Robert Hensing 2021-07-13 18:24:13 +02:00
parent 63c241d6a7
commit c43213bb67
2 changed files with 6 additions and 6 deletions

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, jre8, which, gawk }:
{ lib, stdenv, fetchurl, makeWrapper, jre, which, gawk }:
with lib;
@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre8 which gawk ];
installPhase = ''
mkdir -p "$out/share/neo4j"
@ -24,8 +22,8 @@ stdenv.mkDerivation rec {
do
makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \
"$out/bin/$NEO4J_SCRIPT" \
--prefix PATH : "${lib.makeBinPath [ jre8 which gawk ]}" \
--set JAVA_HOME "${jre8}"
--prefix PATH : "${lib.makeBinPath [ jre which gawk ]}" \
--set JAVA_HOME "${jre}"
done
'';

View file

@ -19911,7 +19911,9 @@ in
check_systemd = callPackage ../servers/monitoring/nagios/plugins/check_systemd.nix { };
neo4j = callPackage ../servers/nosql/neo4j { };
neo4j = callPackage ../servers/nosql/neo4j {
jre = jre8;
};
neo4j-desktop = callPackage ../applications/misc/neo4j-desktop { };