Skip to content

Commit

Permalink
elasticsearch: use jre_headless
Browse files Browse the repository at this point in the history
  • Loading branch information
globin committed Sep 28, 2017
1 parent 35c15d4 commit c57e5d1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkgs/servers/search/elasticsearch/5.x.nix
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, elk5Version, makeWrapper, jre, utillinux, getopt }:
{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux, getopt }:

with stdenv.lib;

Expand All @@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ];

buildInputs = [ makeWrapper jre ] ++
buildInputs = [ makeWrapper jre_headless ] ++
(if (!stdenv.isDarwin) then [utillinux] else [getopt]);

installPhase = ''
Expand All @@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
${if (!stdenv.isDarwin)
then ''--prefix PATH : "${utillinux}/bin/"''
else ''--prefix PATH : "${getopt}/bin"''} \
--set JAVA_HOME "${jre}" \
--set JAVA_HOME "${jre_headless}" \
--set ES_JVM_OPTIONS "$out/config/jvm.options"
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}"
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
'';

meta = {
Expand Down

0 comments on commit c57e5d1

Please sign in to comment.