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

Merge pull request #130114 from roberth/fix-neo4j-JAVA_HOME

Browse Source 
Fix neo4j java home
This commit is contained in:
Robert Hensing 2021-07-18 18:51:27 +02:00 committed by GitHub
commit c8c84795b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/nosql/neo4j/default.nix
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
'';

4
pkgs/top-level/all-packages.nix
View File

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