diff options
author | Andrew Childs <lorne@cons.org.nz> | 2021-03-01 16:23:06 +0900 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2021-11-03 11:37:07 +0100 |
commit | 8fba8ef596a35142eda60ecd7f7355a04c0b6bee (patch) | |
tree | affb96c93f67ffe4ddd02d0878d956bf1e6ba353 | |
parent | 35db6bc5543d352ea7e54375ba12acd70033a7f9 (diff) | |
download | nixpkgs-8fba8ef596a35142eda60ecd7f7355a04c0b6bee.tar nixpkgs-8fba8ef596a35142eda60ecd7f7355a04c0b6bee.tar.gz nixpkgs-8fba8ef596a35142eda60ecd7f7355a04c0b6bee.tar.bz2 nixpkgs-8fba8ef596a35142eda60ecd7f7355a04c0b6bee.tar.lz nixpkgs-8fba8ef596a35142eda60ecd7f7355a04c0b6bee.tar.xz nixpkgs-8fba8ef596a35142eda60ecd7f7355a04c0b6bee.tar.zst nixpkgs-8fba8ef596a35142eda60ecd7f7355a04c0b6bee.zip |
elasticsearch7: remove manual elf patching
The options as specified were not a coherent set. There were three things to consider: autoPatchelfHook, the regular rpath fixup (controlled by dontPatchELF) and the elf interpreter rewrite in the postFixup hook. The autoPatchelfHook will set the interpreter, so the explicit invocation of patchelf to do so in postFixup should not be required. The autoPatchelfHook will rewrite rpaths entirely, so disabling the rpath minimizing via dontPatchELF should have no effect.
-rw-r--r-- | pkgs/servers/search/elasticsearch/7.x.nix | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 2bf2cc0833b..c254b733837 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -50,8 +50,6 @@ stdenv.mkDerivation rec { runtimeDependencies = [ zlib ]; - dontPatchELF = true; - installPhase = '' mkdir -p $out cp -R bin config lib modules plugins $out @@ -68,13 +66,6 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" ''; - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - for exe in $(find $out/modules/x-pack-ml/platform/${plat}-${arch}/bin -executable -type f); do - echo "patching $exe..." - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe" - done - ''; - passthru = { enableUnfree = true; }; meta = { |