From 823f0f1ef08b16e0a0b721df8810040333096abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 30 Oct 2022 09:13:59 +0100 Subject: [PATCH] google-cloud-cpp: use abseil-cpp propagated from grpc It's not the same version and now this difference would break the build. --- pkgs/development/libraries/google-cloud-cpp/default.nix | 2 -- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 5 deletions(-) diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index 18acca3f6915..fb2929a72f16 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, abseil-cpp , c-ares , cmake , crc32c @@ -66,7 +65,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - abseil-cpp c-ares crc32c (curl.override { inherit openssl; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9bbe2de29ea..e400b73c4356 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7360,9 +7360,6 @@ with pkgs; google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { openssl = openssl_1_1; - abseil-cpp = abseil-cpp.override { - cxxStandard = "14"; - }; }; google-java-format = callPackage ../development/tools/google-java-format { };