diff options
Diffstat (limited to 'pkgs/servers/search/elasticsearch/6.x.nix')
| -rw-r--r-- | pkgs/servers/search/elasticsearch/6.x.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 04e81fe150a..3558fd5935e 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -1,15 +1,15 @@ { elk6Version , enableUnfree ? true -, stdenv +, lib, stdenv , fetchurl , makeWrapper , jre_headless -, utillinux, gnugrep, coreutils +, util-linux, gnugrep, coreutils , autoPatchelfHook , zlib }: -with stdenv.lib; +with lib; stdenv.mkDerivation (rec { version = elk6Version; @@ -35,7 +35,8 @@ stdenv.mkDerivation (rec { "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" ''; - buildInputs = [ makeWrapper jre_headless utillinux ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre_headless util-linux ] ++ optional enableUnfree zlib; installPhase = '' @@ -45,7 +46,7 @@ stdenv.mkDerivation (rec { chmod -x $out/bin/*.* wrapProgram $out/bin/elasticsearch \ - --prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \ + --prefix PATH : "${makeBinPath [ util-linux gnugrep coreutils ]}" \ --set JAVA_HOME "${jre_headless}" wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" @@ -61,7 +62,7 @@ stdenv.mkDerivation (rec { }; } // optionalAttrs enableUnfree { dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; runtimeDependencies = [ zlib ]; postFixup = '' for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do |