public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
René Løwe Jacobsen 2021-03-02 11:58:45 +01:00
parent 80308388cd
commit 704a0ab8c3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/servers/search/elasticsearch/6.x.nix
View File

@ -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

2
pkgs/servers/search/elasticsearch/7.x.nix
View File

@ -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