From 7f30088485a24e369798336110ab11f22cbe37a3 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 29 Sep 2021 07:58:42 +0100
Subject: [PATCH] fbida: pull upstream fix for -fno-common compiler

---
 pkgs/applications/graphics/fbida/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index f2d2e267595c..279f49e6a495 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -10,6 +10,15 @@ stdenv.mkDerivation rec {
     sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm";
   };
 
+  patches = [
+    # Upstream patch to fix build on -fno-common toolchains.
+    (fetchurl {
+      name = "no-common.patch";
+      url = "https://git.kraxel.org/cgit/fbida/patch/?id=1bb8a8aa29845378903f3c690e17c0867c820da2";
+      sha256 = "0n5vqbp8wd87q60zfwdf22jirggzngypc02ha34gsj1rd6pvwahi";
+    })
+  ];
+
   nativeBuildInputs = [ pkg-config which ];
   buildInputs = [
     libexif libjpeg libpng giflib freetype fontconfig libtiff libwebp
@@ -19,7 +28,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" "JPEG_VER=62" ];
 
-  patchPhase = ''
+  postPatch = ''
     sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile
     sed -e 's@$(HAVE_LINUX_FB_H)@yes@' -i GNUmakefile
   '';