about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorArtturi <Artturin@artturin.com>2022-05-08 15:05:42 +0300
committerGitHub <noreply@github.com>2022-05-08 15:05:42 +0300
commit14818cc7b29b636ea08cc93a5e9cf57201ceffc1 (patch)
tree55f62bd1846cf9aa6bc324b7095cbc67d6b5a178 /pkgs
parent5f164e4db4d796904331b0edb5d91b4d69f61280 (diff)
parent1d02b2cc9017250c58ad22db7d5aa114becbbac5 (diff)
Merge pull request #171782 from trofi/fix-fno-common-for-ipmitool
ipmitool: fix build on -fno-common toolchains
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/system/ipmitool/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix
index 2ad0d11f95f01..6020f1658e6a7 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/pkgs/tools/system/ipmitool/default.nix
@@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
       url = "https://github.com/ipmitool/ipmitool/commit/e824c23316ae50beb7f7488f2055ac65e8b341f2.patch";
       sha256 = "sha256-X7MnoX2fzByRpRY4p33xetT+V2aehlQ/qU+aeaqtTUY=";
     })
+    # Pull upstream patch to support upstream gcc-10:
+    #   https://github.com/ipmitool/ipmitool/pull/180
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://github.com/ipmitool/ipmitool/commit/51c7e0822f531469cf860dfa5d010c87b284b747.patch";
+      sha256 = "sha256-5UszUdVw3s2S5RCm5Exq4mqDqiYcN62in1O5+TZu9YA=";
+    })
   ];
 
   buildInputs = [ openssl ];