diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2021-07-18 18:51:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-18 18:51:27 +0200 |
| commit | c8c84795b432aecd649a6ce7fea6f7b49140d37b (patch) | |
| tree | fcbed084b5dba9d2b62fb7f9a95163c57da0acd5 | |
| parent | 01c6894d1db673f69b2e6d009bcb8e5bc5c00307 (diff) | |
| parent | 2ed8c5f4a901c80e0cbf8f930f37022a02be608a (diff) | |
| download | nixpkgs-c8c84795b432aecd649a6ce7fea6f7b49140d37b.tar nixpkgs-c8c84795b432aecd649a6ce7fea6f7b49140d37b.tar.gz nixpkgs-c8c84795b432aecd649a6ce7fea6f7b49140d37b.tar.bz2 nixpkgs-c8c84795b432aecd649a6ce7fea6f7b49140d37b.tar.lz nixpkgs-c8c84795b432aecd649a6ce7fea6f7b49140d37b.tar.xz nixpkgs-c8c84795b432aecd649a6ce7fea6f7b49140d37b.tar.zst nixpkgs-c8c84795b432aecd649a6ce7fea6f7b49140d37b.zip | |
Merge pull request #130114 from roberth/fix-neo4j-JAVA_HOME
Fix neo4j java home
| -rw-r--r-- | pkgs/servers/nosql/neo4j/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index d9c9ddf8752..9147de6d4a1 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -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 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1dd7beb83a..52038e03e57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |