From bdaa71a14a2efa6aabf3c297a28f5d3547579609 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 22 Nov 2021 20:20:18 +0000 Subject: [PATCH] flatbuffers: pull pending upstream fix for gcc-12 (#146930) --- pkgs/development/libraries/flatbuffers/2.0.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/flatbuffers/2.0.nix b/pkgs/development/libraries/flatbuffers/2.0.nix index 2b907e77c499..27b661ee0900 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"; + }) + ]; }