From 3f6d2e0275f317ff532ed0b351ecfa818e9e6e81 Mon Sep 17 00:00:00 2001
From: Sam Willcocks <sam@wlcx.cc>
Date: Tue, 30 Jul 2024 17:56:54 +0100
Subject: [PATCH] flatcc: fix build on clang

Also remove obsolete `-Wno-error`s:
- `-Wno-error=misleading-indentation` is now set for us in the
  project's CMakeLists.txt
- `stringop-overflow` violations seemed to be fixed upstream
---
 pkgs/development/libraries/flatcc/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix
index ff78f863a40f..888fd9f61288 100644
--- a/pkgs/development/libraries/flatcc/default.nix
+++ b/pkgs/development/libraries/flatcc/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub
+, fetchpatch
 , cmake
 }:
 
@@ -14,17 +15,21 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-0/IZ7eX6b4PTnlSSdoOH0FsORGK9hrLr1zlr/IHsJFQ=";
   };
 
+  patches = [
+    # Fix builds on clang15. Remove post-0.6.1.
+    (fetchpatch {
+      name = "clang15fixes.patch";
+      url = "https://github.com/dvidelabs/flatcc/commit/5885e50f88248bc7ed398880c887ab23db89f05a.patch";
+      hash = "sha256-z2HSxNXerDFKtMGu6/vnzGRlqfz476bFMjg4DVfbObQ";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
     "-DFLATCC_INSTALL=on"
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-Wno-error=misleading-indentation"
-    "-Wno-error=stringop-overflow"
-  ];
-
   meta = with lib; {
     description = "FlatBuffers Compiler and Library in C for C";
     mainProgram = "flatcc";