Skip to content

Commit ace364b

Browse files
google-cloud-cpp: pin protobuf_29
See upstream PR googleapis/google-cloud-cpp#14974
1 parent 371a9fa commit ace364b

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

pkgs/by-name/go/google-cloud-cpp/package.nix

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
nlohmann_json,
1515
openssl,
1616
pkg-config,
17-
protobuf,
17+
# upstream PR to update: https://github.com/googleapis/google-cloud-cpp/pull/14974
18+
protobuf_29,
1819
pkgsBuildHost,
1920
# default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173
2021
apis ? [ "*" ],
@@ -48,20 +49,11 @@ stdenv.mkDerivation rec {
4849
})
4950
];
5051

51-
nativeBuildInputs =
52-
[
53-
cmake
54-
ninja
55-
pkg-config
56-
]
57-
++ lib.optionals (!doInstallCheck) [
58-
# enable these dependencies when doInstallCheck is false because we're
59-
# unconditionally building tests and benchmarks
60-
#
61-
# when doInstallCheck is true, these deps are added to nativeInstallCheckInputs
62-
gbenchmark
63-
gtest
64-
];
52+
nativeBuildInputs = [
53+
cmake
54+
ninja
55+
pkg-config
56+
];
6557

6658
buildInputs = [
6759
c-ares
@@ -70,7 +62,9 @@ stdenv.mkDerivation rec {
7062
grpc
7163
nlohmann_json
7264
openssl
73-
protobuf
65+
protobuf_29
66+
gbenchmark
67+
gtest
7468
];
7569

7670
doInstallCheck = true;

0 commit comments

Comments
 (0)