diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2022-08-05 06:59:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-05 06:59:40 +0100 |
commit | 14dcb5a3d55213cea4a7aa41ecb094b3bbd33e2a (patch) | |
tree | a7bfaa527f798420cbcf4520f35afe3b5bf96537 | |
parent | 94cfcf7998e02a986be2ffcb0bf081b1ba474b9b (diff) | |
parent | 8a8c18b31e5f34cbdce47271571ed39e730aeb88 (diff) | |
download | nixlib-14dcb5a3d55213cea4a7aa41ecb094b3bbd33e2a.tar nixlib-14dcb5a3d55213cea4a7aa41ecb094b3bbd33e2a.tar.gz nixlib-14dcb5a3d55213cea4a7aa41ecb094b3bbd33e2a.tar.bz2 nixlib-14dcb5a3d55213cea4a7aa41ecb094b3bbd33e2a.tar.lz nixlib-14dcb5a3d55213cea4a7aa41ecb094b3bbd33e2a.tar.xz nixlib-14dcb5a3d55213cea4a7aa41ecb094b3bbd33e2a.tar.zst nixlib-14dcb5a3d55213cea4a7aa41ecb094b3bbd33e2a.zip |
Merge pull request #182917 from smancill/flatbuffers-2.0.6
flatbuffers: 2.0.0 -> 2.0.6
-rw-r--r-- | pkgs/development/libraries/flatbuffers/default.nix | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index a6eefe77c460..d5675990cc3a 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -3,33 +3,30 @@ , fetchFromGitHub , fetchpatch , cmake +, python3 }: stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "2.0.0"; + version = "2.0.6"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "1zbf6bdpps8369r1ql00irxrp58jnalycc8jcapb8iqg654vlfz8"; + sha256 = "sha256-0bJ0n/5yzj6lHXLKJzHUS0Bnlmys+X7pY/3LGapVh6k="; }; - 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"; - }) - ]; + nativeBuildInputs = [ cmake python3 ]; - nativeBuildInputs = [ cmake ]; + postPatch = '' + # Fix default value of "test_data_path" to make tests work + substituteInPlace tests/test.cpp --replace '"tests/";' '"../tests/";' + ''; cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" ]; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; |