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

Merge pull request #114830 from rloewe/master

Browse Source 
elasticsearch: Fix broken unfree version
This commit is contained in:
Sandro 2021-03-03 13:22:08 +01:00 committed by GitHub
commit 369dac8438
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 { } // optionalAttrs enableUnfree {
dontPatchELF = true; dontPatchELF = true;
nativeBuildInputs = [ autoPatchelfHook ]; nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
runtimeDependencies = [ zlib ]; runtimeDependencies = [ zlib ];
postFixup = '' postFixup = ''
for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do 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 { } // optionalAttrs enableUnfree {
dontPatchELF = true; dontPatchELF = true;
nativeBuildInputs = [ autoPatchelfHook ]; nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
runtimeDependencies = [ zlib ]; runtimeDependencies = [ zlib ];
postFixup = '' postFixup = ''
for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do