diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-09-24 09:15:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-09-24 09:15:57 +0200 |
| commit | bc2d33191ab4a938ea24ce57a3c0186599cbc6c9 (patch) | |
| tree | 2dd461e60f73924be1a36b5a8dd20738339d4b28 /pkgs/os-specific | |
| parent | 6dc80b3637164f80843dc7aa42929366106b672d (diff) | |
| parent | 66a68c3a63aa74be59340350e0d135702660f78c (diff) | |
| download | nixpkgs-bc2d33191ab4a938ea24ce57a3c0186599cbc6c9.tar nixpkgs-bc2d33191ab4a938ea24ce57a3c0186599cbc6c9.tar.gz nixpkgs-bc2d33191ab4a938ea24ce57a3c0186599cbc6c9.tar.bz2 nixpkgs-bc2d33191ab4a938ea24ce57a3c0186599cbc6c9.tar.lz nixpkgs-bc2d33191ab4a938ea24ce57a3c0186599cbc6c9.tar.xz nixpkgs-bc2d33191ab4a938ea24ce57a3c0186599cbc6c9.tar.zst nixpkgs-bc2d33191ab4a938ea24ce57a3c0186599cbc6c9.zip | |
Merge #137498: kexec-tools: upstream fix for -fno-common
... into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kexec-tools/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kexec-tools/default.nix b/pkgs/os-specific/linux/kexec-tools/default.nix index 21d803e2b72..6e6eecd4931 100644 --- a/pkgs/os-specific/linux/kexec-tools/default.nix +++ b/pkgs/os-specific/linux/kexec-tools/default.nix @@ -29,6 +29,13 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/kexec-tools/raw/cb1e5463b5298b064e9b6c86ad6fe3505fec9298/f/kexec-tools-2.0.20-fix-broken-multiboot2-buliding-for-i386.patch"; sha256 = "1kzmcsbhwfdgxlc5s88ir0n494phww1j16yk0z42x09qlkxxkg0l"; }) + + (fetchpatch { + # upstream build fix against -fno-common compilers like >=gcc-10 + name = "fno-common.patch"; + url = "https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/patch/?id=cc087b11462af9f971a2c090d07e8d780a867b50"; + sha256 = "043hcsy6m14h64p6b9w25c7a3y0f487322dj81l6mbm6sws6s9lv"; + }) ]; meta = with lib; { |