Skip to content

Commit c57e5d1

Browse files
committedSep 28, 2017
elasticsearch: use jre_headless
1 parent 35c15d4 commit c57e5d1

File tree

1 file changed

+4
-4
lines changed
  • pkgs/servers/search/elasticsearch

1 file changed

+4
-4
lines changed
 

‎pkgs/servers/search/elasticsearch/5.x.nix

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ stdenv, fetchurl, elk5Version, makeWrapper, jre, utillinux, getopt }:
1+
{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux, getopt }:
22

33
with stdenv.lib;
44

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313

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

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

1919
installPhase = ''
@@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
2727
${if (!stdenv.isDarwin)
2828
then ''--prefix PATH : "${utillinux}/bin/"''
2929
else ''--prefix PATH : "${getopt}/bin"''} \
30-
--set JAVA_HOME "${jre}" \
30+
--set JAVA_HOME "${jre_headless}" \
3131
--set ES_JVM_OPTIONS "$out/config/jvm.options"
3232
33-
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}"
33+
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
3434
'';
3535

3636
meta = {

0 commit comments

Comments
 (0)
Please sign in to comment.