diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-09 21:11:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-09 21:11:36 +0100 |
| commit | 8592f10766c53eac51497f13e6cfebee50231bde (patch) | |
| tree | 909d97ccbf138f244262ca1893257edb2b588ef8 | |
| parent | fa77fab07949554e17ec570f239798ccd4e5a1a6 (diff) | |
| parent | cac7e060ef1092cc6a07b109719845b4e59653b4 (diff) | |
| download | nixlib-8592f10766c53eac51497f13e6cfebee50231bde.tar nixlib-8592f10766c53eac51497f13e6cfebee50231bde.tar.gz nixlib-8592f10766c53eac51497f13e6cfebee50231bde.tar.bz2 nixlib-8592f10766c53eac51497f13e6cfebee50231bde.tar.lz nixlib-8592f10766c53eac51497f13e6cfebee50231bde.tar.xz nixlib-8592f10766c53eac51497f13e6cfebee50231bde.tar.zst nixlib-8592f10766c53eac51497f13e6cfebee50231bde.zip | |
Merge pull request #290732 from simonhollingshead/rapidjson-unstable-17only
rapidjson-unstable: Remove C++11 mode.
| -rw-r--r-- | pkgs/development/libraries/rapidjson/unstable.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/libraries/rapidjson/unstable.nix b/pkgs/development/libraries/rapidjson/unstable.nix index 0f4c3d40403e..fd7ffe61ba39 100644 --- a/pkgs/development/libraries/rapidjson/unstable.nix +++ b/pkgs/development/libraries/rapidjson/unstable.nix @@ -6,8 +6,6 @@ , graphviz , gtest , valgrind -# One of "11" or "17"; default in source is CXX 11 -, cxxStandard ? "11" , buildDocs ? true , buildTests ? !stdenv.hostPlatform.isStatic && !stdenv.isDarwin , buildExamples ? true @@ -49,8 +47,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "RAPIDJSON_BUILD_DOC" buildDocs) (lib.cmakeBool "RAPIDJSON_BUILD_TESTS" buildTests) (lib.cmakeBool "RAPIDJSON_BUILD_EXAMPLES" buildExamples) - (lib.cmakeBool "RAPIDJSON_BUILD_CXX11" (cxxStandard == "11")) - (lib.cmakeBool "RAPIDJSON_BUILD_CXX17" (cxxStandard == "17")) + # gtest 1.13+ requires C++14 or later. + (lib.cmakeBool "RAPIDJSON_BUILD_CXX11" false) + (lib.cmakeBool "RAPIDJSON_BUILD_CXX17" true) ] ++ lib.optionals buildTests [ (lib.cmakeFeature "GTEST_INCLUDE_DIR" "${lib.getDev gtest}") ]; @@ -77,6 +76,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ Madouura ]; - broken = (cxxStandard != "11" && cxxStandard != "17"); }; }) |