diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
commit | ee6894ca1297afe0caf2f389c1f9a9220826b749 (patch) | |
tree | 02f96b5744cef8bc55010fb8301f5b50c0748d4c /pkgs/servers/search/elasticsearch/6.x.nix | |
parent | 392874b9b1411dc7b879997bd8776b921feea61d (diff) | |
parent | 617c26df84d5670574864a9ccad0eaf8708bd86a (diff) | |
download | nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.gz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.bz2 nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.lz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.xz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.zst nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.zip |
Merge staging into master
Diffstat (limited to 'pkgs/servers/search/elasticsearch/6.x.nix')
-rw-r--r-- | pkgs/servers/search/elasticsearch/6.x.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 6057c2dee82c..5594fe35b737 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux, getopt }: +{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux }: with stdenv.lib; @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env ''; - buildInputs = [ makeWrapper jre_headless ] ++ - (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + buildInputs = [ makeWrapper jre_headless utillinux ]; installPhase = '' mkdir -p $out @@ -27,9 +26,7 @@ stdenv.mkDerivation rec { chmod -x $out/bin/*.* wrapProgram $out/bin/elasticsearch \ - ${if (!stdenv.isDarwin) - then ''--prefix PATH : "${utillinux}/bin/"'' - else ''--prefix PATH : "${getopt}/bin"''} \ + --prefix PATH : "${utillinux}/bin/" \ --set JAVA_HOME "${jre_headless}" \ --set ES_JVM_OPTIONS "$out/config/jvm.options" |