diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2023-02-10 22:57:40 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2023-02-10 22:57:40 -0500 |
| commit | f93575888a9a1649459cd8461b35dafc147a7f61 (patch) | |
| tree | ef35e9dfadb3490f38dc2e901d07bcebca60982a | |
| parent | Merge pull request #215683 from helsinki-systems/upd/nss_esr (diff) | |
| download | nixpkgs-origin/pr/gtest_cxx17_aarch64.tar.gz | |
gtest: ensure C++17 support for aarch64origin/pr/gtest_cxx17_aarch64
| -rw-r--r-- | pkgs/development/libraries/gtest/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 8e60c08d3600..d4815c7aedc4 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - ] ++ lib.optionals (stdenv.cc.isClang && (lib.versionOlder stdenv.cc.version "16.0")) [ + ] ++ lib.optionals ( + (stdenv.cc.isGNU && (lib.versionOlder stdenv.cc.version "11.0")) + || (stdenv.cc.isClang && (lib.versionOlder stdenv.cc.version "16.0")) + ) [ # Enable C++17 support # https://github.com/google/googletest/issues/3081 "-DCMAKE_CXX_STANDARD=17" |