summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2021-11-22 20:20:18 +0000
committerGitHub <noreply@github.com>2021-11-22 15:20:18 -0500
commitbdaa71a14a2efa6aabf3c297a28f5d3547579609 (patch)
treeffa90063d2d0208e41ee4e4974716aaa246aee7d
parent2676de37fe0a62f983f14eefb5ef3d54fc40c963 (diff)
downloadnixpkgs-bdaa71a14a2efa6aabf3c297a28f5d3547579609.tar
nixpkgs-bdaa71a14a2efa6aabf3c297a28f5d3547579609.tar.gz
nixpkgs-bdaa71a14a2efa6aabf3c297a28f5d3547579609.tar.bz2
nixpkgs-bdaa71a14a2efa6aabf3c297a28f5d3547579609.tar.lz
nixpkgs-bdaa71a14a2efa6aabf3c297a28f5d3547579609.tar.xz
nixpkgs-bdaa71a14a2efa6aabf3c297a28f5d3547579609.tar.zst
nixpkgs-bdaa71a14a2efa6aabf3c297a28f5d3547579609.zip
flatbuffers: pull pending upstream fix for gcc-12 (#146930)
-rw-r--r--pkgs/development/libraries/flatbuffers/2.0.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/flatbuffers/2.0.nix b/pkgs/development/libraries/flatbuffers/2.0.nix
index 2b907e77c49..27b661ee090 100644
--- a/pkgs/development/libraries/flatbuffers/2.0.nix
+++ b/pkgs/development/libraries/flatbuffers/2.0.nix
@@ -1,6 +1,16 @@
-{ callPackage }:
+{ callPackage, fetchpatch }:
 
 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";
+    })
+  ];
 }