diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index be39b0d7cbdd..4aea6433c813 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -2,31 +2,40 @@ , stdenv , fetchFromGitHub , cmake +, ninja , gtest , prometheus-cpp }: stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.8.5"; + version = "1.9.0"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - hash = "sha256-c46Xna/t21WKaFa7n4ieIacsrxJ+15uGNYWCUVuUhsI="; + hash = "sha256-5cl1PIjhXaL58kSyWZXRWLq6BITS2BwEovPhwvk2e18="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ninja ]; + + cmakeFlags = [ + # We ran into issues with gtest 1.8.5 conditioning on + # `#if __has_cpp_attribute(maybe_unused)`, which was, for some + # reason, going through even when C++14 was being used and + # breaking the build on Darwin by triggering warnings about using + # C++17 features. + # + # This might be a problem with our Clang, as it does not reproduce + # with Xcode, but since `-Werror` is painful for us anyway and + # upstream exposes a CMake flag to turn it off, we just use that. + (lib.cmakeBool "BENCHMARK_ENABLE_WERROR" false) + ]; postPatch = '' cp -r ${gtest.src} googletest chmod -R u+w googletest - - # https://github.com/google/benchmark/issues/1396 - substituteInPlace cmake/benchmark.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; # Tests fail on 32-bit due to not enough precision