diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 99e751043be..06f1e2895c0 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" ];