diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 7e44794620c0..f9465c4e356e 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "gtest"; - version = "1.14.0"; + version = "1.15.2"; outputs = [ "out" "dev" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "google"; repo = "googletest"; rev = "v${version}"; - hash = "sha256-t0RchAHTJbuI5YW4uyBPykTvcjy90JW9AOPNjIhwh6U="; + hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM="; }; patches = [ diff --git a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch index 6d29e04b2568..269e437cbcff 100644 --- a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch +++ b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch @@ -1,8 +1,8 @@ diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt -index 428bd9f8..04b84539 100644 +index 99b2411f..33ec9636 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt -@@ -104,10 +104,10 @@ endif() +@@ -105,10 +105,10 @@ endif() string(REPLACE ";" "$" dirs "${gmock_build_include_dirs}") target_include_directories(gmock SYSTEM INTERFACE "$" @@ -16,7 +16,7 @@ index 428bd9f8..04b84539 100644 ######################################################################## # diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt -index 51a67c91..fb09e978 100644 +index dce6a7c9..f1da42ff 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -143,10 +143,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION}) @@ -29,6 +29,6 @@ index 51a67c91..fb09e978 100644 "$" - "$/${CMAKE_INSTALL_INCLUDEDIR}>") + "$") - if(CMAKE_SYSTEM_NAME MATCHES "QNX") + if(CMAKE_SYSTEM_NAME MATCHES "QNX" AND CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL 7.1) target_link_libraries(gtest PUBLIC regex) endif()