public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elasticsearch: use jre_headless

Browse Source
This commit is contained in:
Robin Gloster 2017-09-28 04:16:32 +02:00
parent 35c15d4a61
commit c57e5d1aa9
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/search/elasticsearch/5.x.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, elk5Version, makeWrapper, jre, utillinux, getopt }: { stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux, getopt }:
with stdenv.lib; with stdenv.lib;
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; 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]); (if (!stdenv.isDarwin) then [utillinux] else [getopt]);
installPhase = '' installPhase = ''
@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
${if (!stdenv.isDarwin) ${if (!stdenv.isDarwin)
then ''--prefix PATH : "${utillinux}/bin/"'' then ''--prefix PATH : "${utillinux}/bin/"''
else ''--prefix PATH : "${getopt}/bin"''} \ else ''--prefix PATH : "${getopt}/bin"''} \
--set JAVA_HOME "${jre}" \ --set JAVA_HOME "${jre_headless}" \
--set ES_JVM_OPTIONS "$out/config/jvm.options" --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 = { meta = {