From 63c241d6a7fd1dfd9d6951f41a7d6d9e97040608 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 13 Jul 2021 18:16:35 +0200 Subject: [PATCH 1/3] neo4j: Fix JAVA_HOME --- pkgs/servers/nosql/neo4j/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index d9c9ddf8752..0ca16988c87 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \ "$out/bin/$NEO4J_SCRIPT" \ --prefix PATH : "${lib.makeBinPath [ jre8 which gawk ]}" \ - --set JAVA_HOME "$jre8" + --set JAVA_HOME "${jre8}" done ''; From c43213bb6784af05faa7155e591400f7435797eb Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 13 Jul 2021 18:24:13 +0200 Subject: [PATCH 2/3] 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. --- pkgs/servers/nosql/neo4j/default.nix | 8 +++----- 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 0ca16988c87..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 280283e0761..5bde6bda1b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 2ed8c5f4a901c80e0cbf8f930f37022a02be608a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 13 Jul 2021 18:25:30 +0200 Subject: [PATCH 3/3] neo4j: Use jre8 -> jre8_headless --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bde6bda1b8..f0aeb9dda9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19912,7 +19912,7 @@ in check_systemd = callPackage ../servers/monitoring/nagios/plugins/check_systemd.nix { }; neo4j = callPackage ../servers/nosql/neo4j { - jre = jre8; + jre = jre8_headless; }; neo4j-desktop = callPackage ../applications/misc/neo4j-desktop { };