From b12448c001fd6f34099685662cb919752c84ab1f Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Fri, 18 May 2018 17:05:04 +0200
Subject: [PATCH] elfutils: add patch that fixes compilation under gcc8
 (#40705)

* elfutils: add patch that fixes compilation under gcc8

* elfutils: follow advice from @jtojnar
---
 pkgs/development/tools/misc/elfutils/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index e89aba67999..d8738bf62f9 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -10,7 +10,16 @@ stdenv.mkDerivation rec {
     sha256 = "0rp0r54z44is49c594qy7hr211nhb00aa5y7z74vsybbaxslg10z";
   };
 
-  patches = ./debug-info-from-env.patch;
+  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";
+    })
+  ];
 
   hardeningDisable = [ "format" ];