From 8df68a93e636ce5c67a79713c35eb55a9dfd1bba Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 25 Sep 2018 05:00:44 +0200 Subject: 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 Cc: @apeschar, @basvandijk --- pkgs/servers/search/elasticsearch/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 84872649c492..5a43a30257ed 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 -- cgit 1.4.1