From 704a0ab8c37b9dc3ab2cebde1feb8e70adb1f091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20L=C3=B8we=20Jacobsen?= Date: Tue, 2 Mar 2021 11:58:45 +0100 Subject: [PATCH] elasticsearch: Fix broken unfree version The current unfree versions are broken because makeWrapper is not a part of nativeBuildInputs. The bug was introduced in #112276. --- pkgs/servers/search/elasticsearch/6.x.nix | 2 +- pkgs/servers/search/elasticsearch/7.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index b3ad305687af..3558fd5935e4 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -62,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 diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index ffe8a75412bd..f808b6985b47 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -73,7 +73,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