Merge pull request #93144 from tobim/flatbuffers/1.12.0

flatbuffers: 1.11.0 -> 1.12.0
This commit is contained in:
Mario Rodas 2020-07-19 18:12:14 -05:00 committed by GitHub
commit 6ef281a911
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
stdenv.mkDerivation (rec {
stdenv.mkDerivation rec {
pname = "flatbuffers";
version = "1.11.0";
version = "1.12.0";
src = fetchFromGitHub {
owner = "google";
repo = "flatbuffers";
rev = "v${version}";
sha256 = "1gl8pnykzifh7pnnvl80f5prmj5ga60dp44inpv9az2k9zaqx3qr";
sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g";
};
preConfigure = stdenv.lib.optional stdenv.buildPlatform.isDarwin ''
@ -36,12 +36,4 @@ stdenv.mkDerivation (rec {
platforms = stdenv.lib.platforms.unix;
homepage = "https://google.github.io/flatbuffers/";
};
} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isMusl {
# Remove when updating to the next version.
patches = [
(fetchpatch {
url = "https://github.com/google/flatbuffers/commit/2b52494047fb6e97af03e1801b42adc7ed3fd78a.diff";
sha256 = "01k07ws0f4w7nnl8nli795wgjm4p94lxd3kva4yf7nf3pg4p8arx";
})
];
})
}