diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2023-02-13 15:31:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-13 15:31:27 -0500 |
| commit | 938a52f603f1a545319441832441fb40820a7953 (patch) | |
| tree | ef2dcdb010b344afbb4c38d3309b85313073e97c | |
| parent | ca784e051c4b3aae056b562995b5613d66ec33f2 (diff) | |
| download | nixpkgs-938a52f603f1a545319441832441fb40820a7953.tar nixpkgs-938a52f603f1a545319441832441fb40820a7953.tar.gz nixpkgs-938a52f603f1a545319441832441fb40820a7953.tar.bz2 nixpkgs-938a52f603f1a545319441832441fb40820a7953.tar.lz nixpkgs-938a52f603f1a545319441832441fb40820a7953.tar.xz nixpkgs-938a52f603f1a545319441832441fb40820a7953.tar.zst nixpkgs-938a52f603f1a545319441832441fb40820a7953.zip | |
gtest: ensure C++17 support for aarch64 (#215767)
| -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 8e60c08d360..d4815c7aedc 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" |