diff --git a/pkgs/development/libraries/flatbuffers/2.0.nix b/pkgs/development/libraries/flatbuffers/2.0.nix
index 27b661ee09004..9783391010112 100644
--- a/pkgs/development/libraries/flatbuffers/2.0.nix
+++ b/pkgs/development/libraries/flatbuffers/2.0.nix
@@ -1,16 +1,7 @@
-{ callPackage, fetchpatch }:
+{ callPackage }:
 
 callPackage ./generic.nix {
-  version = "2.0.0";
-  sha256 = "1zbf6bdpps8369r1ql00irxrp58jnalycc8jcapb8iqg654vlfz8";
-
-  patches = [
-    # Pull patch pending upstream inclustion for gcc-12 support:
-    #  https://github.com/google/flatbuffers/pull/6946
-    (fetchpatch {
-      name = "gcc-12.patch";
-      url = "https://github.com/google/flatbuffers/commit/17d9f0c4cf47a9575b4f43a2ac33eb35ba7f9e3e.patch";
-      sha256 = "0sksk47hi7camja9ppnjr88jfdgj0nxqxy8976qs1nx73zkgbpf9";
-    })
-  ];
+  version = "2.0.6";
+  sha256 = "1ac7anm1kjzxcglpxydcdjb6fh2bshqjgjkj3njkxkkjzsgp9cni";
+  checks = false;
 }
diff --git a/pkgs/development/libraries/flatbuffers/generic.nix b/pkgs/development/libraries/flatbuffers/generic.nix
index 1cdfb4b9c8703..f21da9c1e3095 100644
--- a/pkgs/development/libraries/flatbuffers/generic.nix
+++ b/pkgs/development/libraries/flatbuffers/generic.nix
@@ -1,12 +1,5 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, version
-, sha256
-, patches ? [ ]
-, preConfigure ? null
-}:
+{ lib, stdenv, fetchFromGitHub, cmake, version, sha256, patches ? [ ]
+, preConfigure ? null, checks ? stdenv.hostPlatform == stdenv.buildPlatform }:
 
 stdenv.mkDerivation rec {
   pname = "flatbuffers";
@@ -23,11 +16,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = [
-    "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
-  ];
+  cmakeFlags =
+    [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" ];
 
-  doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
+  doCheck = checks;
   checkTarget = "test";
 
   meta = with lib; {