Revert "Merge #221900: emacs: use patchelf_0_15 to avoid upstream bug"

This reverts commit ce7e136, reversing changes made to 4d82a45.
NixOS · Mar 20, 2023 · df0d3e3 · df0d3e3
1 parent ce15577
commit df0d3e3
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 45 deletions.
diff --git 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
diff --git 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 { });