JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #111376 from lukegb/wimboot

Browse Source 
wimboot: fix builds under binutils 2.34+
This commit is contained in:
ajs124 2021-02-01 18:01:59 +01:00 committed by GitHub
commit 80764b37eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/misc/wimboot/default.nix
View File

@ -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
};