From 8fba8ef596a35142eda60ecd7f7355a04c0b6bee Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Mon, 1 Mar 2021 16:23:06 +0900
Subject: [PATCH] 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.
---
 pkgs/servers/search/elasticsearch/7.x.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix
index 2bf2cc0833b4..c254b733837b 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 = {