summary refs log tree commit diff
path: root/pkgs/servers/search/elasticsearch
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2018-09-25 05:00:44 +0200
committeraszlig <aszlig@nix.build>2018-09-25 05:09:37 +0200
commit8df68a93e636ce5c67a79713c35eb55a9dfd1bba (patch)
treee9911a3b23073b98aaa681813225da245513f9d0 /pkgs/servers/search/elasticsearch
parentb4526040a21303a1822fcad348e9b9e39a3876b9 (diff)
downloadnixpkgs-8df68a93e636ce5c67a79713c35eb55a9dfd1bba.tar
nixpkgs-8df68a93e636ce5c67a79713c35eb55a9dfd1bba.tar.gz
nixpkgs-8df68a93e636ce5c67a79713c35eb55a9dfd1bba.tar.bz2
nixpkgs-8df68a93e636ce5c67a79713c35eb55a9dfd1bba.tar.lz
nixpkgs-8df68a93e636ce5c67a79713c35eb55a9dfd1bba.tar.xz
nixpkgs-8df68a93e636ce5c67a79713c35eb55a9dfd1bba.tar.zst
nixpkgs-8df68a93e636ce5c67a79713c35eb55a9dfd1bba.zip
elasticsearch: Add zlib to buildInputs for unfree
The unfree variant of elasticsearch uses autoPatchelfHook and since we
removed the dependency on file for the hook itself in
58a97dfb491be6ae92499c3f819440f281d826a1 we no longer have zlib
propagated.

So we need to explicitly state that dependency here.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @apeschar, @basvandijk
Diffstat (limited to 'pkgs/servers/search/elasticsearch')
-rw-r--r--pkgs/servers/search/elasticsearch/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index 84872649c49..5a43a30257e 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation (rec {
     sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env
   '';
 
-  buildInputs = [ makeWrapper jre_headless utillinux ];
+  buildInputs = [ makeWrapper jre_headless utillinux ]
+             ++ optional enableUnfree zlib;
 
   installPhase = ''
     mkdir -p $out