git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #130114 from roberth/fix-neo4j-JAVA_HOME

Fix neo4j java home

commitc8c84795b432aecd649a6ce7fea6f7b49140d37b authorRobert Hensing <roberth@users.noreply.github.com> dateSun 18 Jul 2021, 18:51 (5 years ago) parent01c68942ed8c5f
2 files changed+6−6
pkgs/servers/nosql/neo4j/default.nix+3−5 pkgs/top-level/all-packages.nix+3−1
pkgs/servers/nosql/neo4j/default.nix+3−5
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, makeWrapper, jre8, which, gawk }:
1+{ lib, stdenv, fetchurl, makeWrapper, jre, which, gawk }:
22
33with lib;
44
@@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 nativeBuildInputs = [ makeWrapper ];
15− buildInputs = [ jre8 which gawk ];
16−
1715
1816 installPhase = ''
1917 mkdir -p "$out/share/neo4j"
@@ -24,8 +22,8 @@ stdenv.mkDerivation rec {
2422 do
2523 makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \
2624 "$out/bin/$NEO4J_SCRIPT" \
27− --prefix PATH : "${lib.makeBinPath [ jre8 which gawk ]}" \
28− --set JAVA_HOME "$jre8"
25+ --prefix PATH : "${lib.makeBinPath [ jre which gawk ]}" \
26+ --set JAVA_HOME "${jre}"
2927 done
3028 '';
3129
pkgs/top-level/all-packages.nix+3−1
@@ -19986,7 +19986,9 @@ in
1998619986
1998719987 check_systemd = callPackage ../servers/monitoring/nagios/plugins/check_systemd.nix { };
1998819988
19989− neo4j = callPackage ../servers/nosql/neo4j { };
19989+ neo4j = callPackage ../servers/nosql/neo4j {
19990+ jre = jre8_headless;
19991+ };
1999019992
1999119993 neo4j-desktop = callPackage ../applications/misc/neo4j-desktop { };
1999219994