Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f52c8d57056b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: acbdd4a2a2f5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 4, 2021

  1. flatbuffers: unbreak with gcc10

    @rmcgibbo
    rmcgibbo committed Jan 4, 2021
    Copy the full SHA
    cb0b092 View commit details

Commits on Jan 5, 2021

  1. Merge pull request #108415 from rmcgibbo/flatbuffers 

    flatbuffers: unbreak with gcc10
    @SuperSandro2000
    SuperSandro2000 authored Jan 5, 2021
    Copy the full SHA
    acbdd4a View commit details
Showing with 15 additions and 0 deletions.
  1. +15 −0 pkgs/development/libraries/flatbuffers/default.nix
15 changes: 15 additions & 0 deletions pkgs/development/libraries/flatbuffers/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,21 @@ stdenv.mkDerivation rec {
rev = "v${version}";
sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g";
};
patches = [
(fetchpatch {
# Fixed a compilation error with GCC 10.0 to 11.0. June 1, 2020.
# Should be included in the next release after 1.12.0
url = "https://github.com/google/flatbuffers/commit/988164f6e1675bbea9c852e2d6001baf4d1fcf59.patch";
sha256 = "0d8c2bywqmkhdi0a41cry85wy4j58pl0vd6h5xpfqm3fr8w0mi9s";
excludes = [ "src/idl_gen_cpp.cpp" ];
})
(fetchpatch {
# Fixed a compilation error with GCC 10.0 to 11.0. July 6, 2020.
# Should be included in the next release after 1.12.0
url = "https://github.com/google/flatbuffers/pull/6020/commits/44c7a4cf439b0a298720b5a448bcc243a882b0c9.patch";
sha256 = "126xwkvnlc4ignjhxv9jygfd9j6kr1jx39hyk0ddpcmvzfqsccf4";
})
];

preConfigure = stdenv.lib.optional stdenv.buildPlatform.isDarwin ''
rm BUILD