diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2023-05-29 22:02:44 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2023-05-29 22:09:32 +0100 |
commit | 3daf489719edd9776a0a452c9b4954b77e744584 (patch) | |
tree | 9e362bf4c6f39ef57c3f6b825e7a99eaa9fb367e /pkgs/development/libraries/nlohmann_json | |
parent | 5996187504b67d4d8d2359cc3fd397769b4028d2 (diff) |
nlohmann_json: backport gcc-13 fix
Without the change `nlohmann_json` build on `gcc-13 `fails as: In file included from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34, from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/basic_string.h:39, from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/string:54, from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/locale_classes.h:40, from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/locale:41, from tests/src/unit-regression2.cpp:19: <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind<my_allocator<unsigned char>, unsigned char, void>': <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11: required by substitution of 'template<class _Alloc, class _Up> using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = my_allocator<unsigned char>; _Up = unsigned char]' <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8: required by substitution of 'template<class _Alloc> template<class _Tp> using std::allocator_traits< <template-parameter-1-1> >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = my_allocator<unsigned char>]' <<NIX>>-gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65: required from 'struct __gnu_cxx::__alloc_traits<my_allocator<unsigned char>, unsigned char>::rebind<unsigned char>' <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base<unsigned char, my_allocator<unsigned char> >' <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11: required from 'class std::vector<unsigned char, my_allocator<unsigned char> >' tests/src/unit-regression2.cpp:807:63: required from here <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must be A 70 | _Tp>::value, | ^~~~~
Diffstat (limited to 'pkgs/development/libraries/nlohmann_json')
-rw-r--r-- | pkgs/development/libraries/nlohmann_json/default.nix | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 3c8244c755320..29c7ca2c690bf 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake }: let @@ -21,6 +22,24 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-SUdhIV7tjtacf5DkoWk9cnkfyMlrkg8ZU7XnPZd22Tw="; }; + patches = [ + # Backport fix for gcc-13: + # https://github.com/nlohmann/json/pull/3895 + (fetchpatch { + name = "gcc-13-rebind.patch"; + url = "https://github.com/nlohmann/json/commit/a5b09d50b786638ed9deb09ef13860a3cb64eb6b.patch"; + hash = "sha256-Jbi0VwZP+ZHTGbpIwgKCVc66gOmwjkT5iOUe85eIzM0="; + }) + + # Backport fix for gcc-13: + # https://github.com/nlohmann/json/pull/3950 + (fetchpatch { + name = "gcc-13-eq-op.patch"; + url = "https://github.com/nlohmann/json/commit/a49829bd984c0282be18fcec070df0c31bf77dd5.patch"; + hash = "sha256-D+cRtdN6AXr4z3/y9Ui7Zqp3e/y10tp+DOL80ZtPz5E="; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ |