diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix')
| -rw-r--r-- | nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix b/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix index 86230e11cb98..3558fd5935e4 100644 --- a/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix +++ b/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation (rec { "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" ''; - buildInputs = [ makeWrapper jre_headless util-linux ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre_headless util-linux ] ++ optional enableUnfree zlib; installPhase = '' @@ -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 |