summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kexec-tools
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2021-09-12 09:08:53 +0100
committerSergei Trofimovich <slyich@gmail.com>2021-09-12 09:09:07 +0100
commit66a68c3a63aa74be59340350e0d135702660f78c (patch)
treeaaae0e7b13bf8709c5f6ed5c2efa03cf263cc6cd /pkgs/os-specific/linux/kexec-tools
parentd370d9ee99c1ae8e7c5e71d2722309eb645fc3df (diff)
downloadnixpkgs-66a68c3a63aa74be59340350e0d135702660f78c.tar
nixpkgs-66a68c3a63aa74be59340350e0d135702660f78c.tar.gz
nixpkgs-66a68c3a63aa74be59340350e0d135702660f78c.tar.bz2
nixpkgs-66a68c3a63aa74be59340350e0d135702660f78c.tar.lz
nixpkgs-66a68c3a63aa74be59340350e0d135702660f78c.tar.xz
nixpkgs-66a68c3a63aa74be59340350e0d135702660f78c.tar.zst
nixpkgs-66a68c3a63aa74be59340350e0d135702660f78c.zip
kexec-tools: pull upstream fix for -fno-common compiler
Fixes build failure against upstream gcc (defaults -fno-common)
Diffstat (limited to 'pkgs/os-specific/linux/kexec-tools')
-rw-r--r--pkgs/os-specific/linux/kexec-tools/default.nix7
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; {