about summary refs log tree commit diff
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2022-07-04 01:48:24 +0200
committerajs124 <git@ajs124.de>2022-08-17 20:16:23 +0200
commit945ac1c9d83c7d216b7a655d02b3e7eefb9e2393 (patch)
treecd40e112888648e043e21ce4592bfd20641bc1d1
parentd1b2156d4288ef9e0df05933426745fcc48bb86f (diff)
google-cloud-cpp: pin to openssl 1.1
-rw-r--r--pkgs/development/libraries/google-cloud-cpp/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix
index 8758daf9c3ab3..2c5cade6b69c0 100644
--- a/pkgs/development/libraries/google-cloud-cpp/default.nix
+++ b/pkgs/development/libraries/google-cloud-cpp/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     abseil-cpp
     c-ares
     crc32c
-    curl
+    (curl.override { inherit openssl; })
     grpc
     nlohmann_json
     openssl
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e743e092191aa..3005b5150cfc4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6955,6 +6955,7 @@ with pkgs;
   google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { };
 
   google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp {
+    openssl = openssl_1_1;
     abseil-cpp = abseil-cpp.override {
       cxxStandard = "14";
     };