From bcac8869719b7d94517b9d91be69aa8fa1237202 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sat, 7 Sep 2019 07:20:19 +0000
Subject: [PATCH] Revert "elfutils: add patch that fixes compilation under gcc8
 (#40705)"

This reverts commit b12448c001fd6f34099685662cb919752c84ab1f.
---
 pkgs/development/tools/misc/elfutils/default.nix | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 99e751043beb..06f1e2895c02 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -10,20 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb";
   };
 
-  postPatch = ''
-    patchShebangs tests
-  '';
-
-  patches = [
-    ./debug-info-from-env.patch
-
-    /* For gcc8. Fixes -Werror=packed-not-aligned errors.
-    incorporated in upstream, so can probably be removed at next update */
-    (fetchurl {
-      url = http://git.openembedded.org/openembedded-core/plain/meta/recipes-devtools/elfutils/files/0001-Ensure-that-packed-structs-follow-the-gcc-memory-lay.patch?id=49aae1d75ff1c6a9643c30a8cc5776a2ffa83dd3;
-      sha256 = "11sg2dn3vjvgq2fb9n8pgw1ajvs3gliks7djg1794wxlfg0rvifb";
-    })
-  ];
+  patches = [ ./debug-info-from-env.patch ];
 
   hardeningDisable = [ "format" ];