Merge pull request #176400 from trofi/fix-fno-common-for-xboard

xboard: pull patch pending upstream inclusion for -fno-common toolcha…
2022-06-05 14:44:14 +00:00
parent fb52e287c7 e3b9cba7cb
commit 93622759d1
1 changed files with 11 additions and 0 deletions
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchurl
+, fetchpatch
 , libX11
 , xorgproto
 , libXt
@@ -28,6 +29,16 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-Ky5T6EKK2bbo3IpVs6UYM4GRGk2uLABy+pYpa7sZcNY=";
  };

+  patches = [
+    # Pull patch pending upstream inclusion for -fno-common toolchain support:
+    #   https://savannah.gnu.org/patch/index.php?10211
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://savannah.gnu.org/patch/download.php?file_id=53275";
+      sha256 = "sha256-ZOo9jAy1plFjhC5HXJQvXL+Zf7FL14asV3G4AwfgqTY=";
+    })
+  ];
+
  buildInputs = [
    libX11
    xorgproto