diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix index 3b8a0fe9f0f4..1f6c115e09ae 100644 --- a/pkgs/by-name/go/google-cloud-cpp/package.nix +++ b/pkgs/by-name/go/google-cloud-cpp/package.nix @@ -14,7 +14,8 @@ nlohmann_json, openssl, pkg-config, - protobuf, + # upstream PR to update: https://github.com/googleapis/google-cloud-cpp/pull/14974 + protobuf_29, pkgsBuildHost, # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173 apis ? [ "*" ], @@ -48,20 +49,11 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = - [ - cmake - ninja - pkg-config - ] - ++ lib.optionals (!doInstallCheck) [ - # enable these dependencies when doInstallCheck is false because we're - # unconditionally building tests and benchmarks - # - # when doInstallCheck is true, these deps are added to nativeInstallCheckInputs - gbenchmark - gtest - ]; + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; buildInputs = [ c-ares @@ -70,7 +62,9 @@ stdenv.mkDerivation rec { grpc nlohmann_json openssl - protobuf + protobuf_29 + gbenchmark + gtest ]; doInstallCheck = true;