From 2a64ca263bd4e1a54659ec49a1c574087ea86310 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Sun, 15 Aug 2021 15:40:30 +0200
Subject: [PATCH] wimboot: 2.6.0 -> 2.7.3

---
 pkgs/tools/misc/wimboot/default.nix | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix
index 04dbca9ed63f..538f5113fd8d 100644
--- a/pkgs/tools/misc/wimboot/default.nix
+++ b/pkgs/tools/misc/wimboot/default.nix
@@ -1,38 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, libbfd, zlib, libiberty }:
+{ lib, stdenv, fetchFromGitHub, libbfd, zlib, libiberty }:
 
 stdenv.mkDerivation rec {
   pname = "wimboot";
-  version = "2.6.0";
+  version = "2.7.3";
 
   src = fetchFromGitHub {
     owner = "ipxe";
     repo = "wimboot";
     rev = "v${version}";
-    sha256 = "134wqqr147az5vbj4szd0xffwa99b4rar7w33zm3119zsn7sd79k";
+    sha256 = "12c677agkmiqs35qfpqfj7c4kxkizhbk9l6hig36dslzp4fwpl70";
   };
 
-  NIX_CFLAGS_COMPILE = "-Wno-address-of-packed-member"; # Fails on gcc9
-
-  patches = [
-    # Fixes for newer binutils
-    # Add R_X86_64_PLT32 as known reloc target
-    (fetchpatch {
-      url = "https://github.com/ipxe/wimboot/commit/91be50c17d4d9f463109d5baafd70f9fdadd86db.patch";
-      sha256 = "113448n49hmk8nz1dxbhxiciwl281zwalvb8z5p9xfnjvibj8274";
-    })
-    # Fix building with binutils 2.34 (bfd_get_section_* removed in favour of bfd_section_*)
-    (fetchpatch {
-      url = "https://github.com/ipxe/wimboot/commit/2f97e681703d30b33a4d5032a8025ab8b9f2de75.patch";
-      sha256 = "0476mp74jaq3k099b654al6yi2yhgn37d9biz0wv3ln2q1gy94yf";
-    })
-  ];
-
-  # We cannot use sourceRoot because the patch wouldn't apply
-  postPatch = ''
-    cd src
-  '';
-
-  hardeningDisable = [ "pic" ];
+  sourceRoot = "source/src";
 
   buildInputs = [ libbfd zlib libiberty ];
   makeFlags = [ "wimboot.x86_64.efi" ];