about summary refs log tree commit diff
path: root/pkgs/tools/misc/graylog
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2021-03-27 17:51:43 +0100
committerLinus Heckemann <git@sphalerite.org>2021-03-28 14:37:28 +0200
commit22de3c19e765088f8dfd243e9bbd95330d7d8a10 (patch)
tree53255230cb7e5ba357e9bb14813026b1912ce931 /pkgs/tools/misc/graylog
parentd3f7e969b9860fb80750147aeb56dab1c730e756 (diff)
graylog: improve JRE handling
Since the upstream graylogctl script will prefer finding its java
executable based on JAVA_HOME, we now set this instead of PATH in
order to allow it to find the JRE. By setting it conditionally on it
not already being set, we allow selecting a different JRE at runtime.

We also explicitly use openjdk11, which supports the
UseConcMarkSweepGC option which graylog insists on using.
Diffstat (limited to 'pkgs/tools/misc/graylog')
-rw-r--r--pkgs/tools/misc/graylog/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 8ebb2924b0360..b41cc9cb06994 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, makeWrapper, jre_headless, nixosTests }:
+{ lib, stdenv, fetchurl, makeWrapper, openjdk11_headless, nixosTests }:
 
 stdenv.mkDerivation rec {
   pname = "graylog";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   nativeBuildInputs = [ makeWrapper ];
-  makeWrapperArgs = [ "--prefix" "PATH" ":" "${jre_headless}/bin" ];
+  makeWrapperArgs = [ "--set-default" "JAVA_HOME" "${openjdk11_headless}" ];
 
   passthru.tests = { inherit (nixosTests) graylog; };