diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-01-31 01:34:22 +0000 |
|---|---|---|
| committer | Luke Granger-Brown <git@lukegb.com> | 2021-01-31 03:05:47 +0000 |
| commit | 331935870af25ea3864a4f5b040032be5e4020d6 (patch) | |
| tree | 7a6989b46685fb8ee8ff077e224578a683046d69 /pkgs/tools/misc/wimboot | |
| parent | b83e3e24630a091de2f106446f8083e5e364234d (diff) | |
wimboot: fix builds under binutils 2.34+
Diffstat (limited to 'pkgs/tools/misc/wimboot')
| -rw-r--r-- | pkgs/tools/misc/wimboot/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix index b25e0b55379dd..04dbca9ed63f2 100644 --- a/pkgs/tools/misc/wimboot/default.nix +++ b/pkgs/tools/misc/wimboot/default.nix @@ -14,12 +14,17 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-address-of-packed-member"; # Fails on gcc9 patches = [ - # Fix for newer binutils + # Fixes for newer binutils + # Add R_X86_64_PLT32 as known reloc target (fetchpatch { - url = - "https://github.com/ipxe/wimboot/commit/91be50c17d4d9f463109d5baafd70f9fdadd86db.patch"; + 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 @@ -40,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://ipxe.org/wimboot"; description = "Windows Imaging Format bootloader"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ das_j ajs124 ]; platforms = platforms.x86; # Fails on aarch64 }; |