From 66a68c3a63aa74be59340350e0d135702660f78c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 12 Sep 2021 09:08:53 +0100 Subject: kexec-tools: pull upstream fix for -fno-common compiler Fixes build failure against upstream gcc (defaults -fno-common) --- pkgs/os-specific/linux/kexec-tools/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pkgs/os-specific/linux/kexec-tools') 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; { -- cgit 1.4.1