From df0d3e3ea1a579aa994327a4c69b7f742e3ece63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 20 Mar 2023 16:02:30 +0100
Subject: [PATCH] Revert "Merge #221900: emacs: use patchelf_0_15 to avoid
 upstream bug"

This reverts commit ce7e136b6a8cb9808c7b0fdb7fc6c5ed5adc7bc1, reversing
changes made to 4d82a453fbe31b1b5db47f0d3d00059f8aef3908.
---
 pkgs/applications/editors/emacs/generic.nix   |  4 ---
 pkgs/development/tools/misc/patchelf/0.15.nix | 36 -------------------
 pkgs/top-level/all-packages.nix               |  5 ---
 3 files changed, 45 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/patchelf/0.15.nix

diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix
index e985202fad23..7b71fccd6b8a 100644
--- a/pkgs/applications/editors/emacs/generic.nix
+++ b/pkgs/applications/editors/emacs/generic.nix
@@ -15,7 +15,6 @@
 , recurseIntoAttrs, emacsPackagesFor
 , libgccjit, makeWrapper # native-comp params
 , fetchFromSavannah, fetchFromBitbucket
-, patchelf_0_15
 
   # macOS dependencies for NS and macPort
 , AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
@@ -137,9 +136,6 @@ assert withTreeSitter -> tree-sitter != null;
   ];
 
   nativeBuildInputs = [ pkg-config makeWrapper ]
-    # TODO: remove once it's fixed upstream and released:
-    #   https://github.com/NixOS/patchelf/issues/482
-    ++ [ patchelf_0_15 ]
     ++ lib.optionals (srcRepo || withMacport) [ texinfo ]
     ++ lib.optionals srcRepo [ autoreconfHook ]
     ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
diff --git a/pkgs/development/tools/misc/patchelf/0.15.nix b/pkgs/development/tools/misc/patchelf/0.15.nix
deleted file mode 100644
index fc71c4aa4ea4..000000000000
--- a/pkgs/development/tools/misc/patchelf/0.15.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-# Note: this package is used for bootstrapping fetchurl, and thus
-# cannot use fetchpatch! All mutable patches (generated by GitHub or
-# cgit) that are needed here should be included directly in Nixpkgs as
-# files.
-
-stdenv.mkDerivation rec {
-  pname = "patchelf";
-  version = "0.15.0";
-
-  src = fetchurl {
-    url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-9ANtPuTY4ijewb7/8PbkbYpA6eVw4AaOOdd+YuLIvcI=";
-  };
-
-  strictDeps = true;
-
-  setupHook = [ ./setup-hook.sh ];
-
-  enableParallelBuilding = true;
-
-  # fails 8 out of 24 tests, problems when loading libc.so.6
-  doCheck = stdenv.name == "stdenv-linux"
-    # test scripts require unprefixed bintools binaries
-    # https://github.com/NixOS/patchelf/issues/417
-    && stdenv.cc.targetPrefix == "";
-
-  meta = with lib; {
-    homepage = "https://github.com/NixOS/patchelf";
-    license = licenses.gpl3Plus;
-    description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
-    maintainers = [ maintainers.eelco ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0cacbe78ebd1..f6a1baa7e226 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18570,11 +18570,6 @@ with pkgs;
   patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix {
     patchelf = patchelfStable;
   };
-
-  # used by emacs which is not compatible to 0.17.2 release:
-  #   https://github.com/NixOS/patchelf/issues/482
-  patchelf_0_15 = callPackage ../development/tools/misc/patchelf/0.15.nix { };
-
   patchelfStable = callPackage ../development/tools/misc/patchelf { };
 
   patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { });