treewide: avoid mixing abseil-cpp versions

The packages use some version through grpc;
adding in a different one is most likely not a good idea.

`rippled` has been failing to build for weeks already.
The other three packages build before and after this commit.
This commit is contained in:
Vladimír Čunát 2022-10-30 09:44:34 +01:00
parent 823f0f1ef0
commit 5033fffabe
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
4 changed files with 3 additions and 9 deletions

View file

@ -11,7 +11,6 @@
, openssl
, pkg-config
, c-ares
, abseil-cpp
, libGL
, zlib
, curl
@ -51,7 +50,6 @@ mkDerivation rec {
grpc
protobuf
openssl
abseil-cpp
c-ares
];

View file

@ -3,7 +3,6 @@
, fetchurl
, fetchFromGitHub
, fixDarwinDylibNames
, abseil-cpp
, autoconf
, aws-sdk-cpp
, boost
@ -147,10 +146,9 @@ stdenv.mkDerivation rec {
protobuf
] ++ lib.optionals enableS3 [ aws-sdk-cpp openssl ]
++ lib.optionals enableGcs [
abseil-cpp
crc32c
curl
google-cloud-cpp
google-cloud-cpp grpc
nlohmann_json
];

View file

@ -9,7 +9,6 @@
, gtest
, spdlog
, c-ares
, abseil-cpp
, zlib
, sqlite
, re2
@ -36,7 +35,6 @@ stdenv.mkDerivation rec {
gtest
spdlog
c-ares
abseil-cpp
zlib
sqlite
re2

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config
, openssl, boost, grpc, abseil-cpp, protobuf, libnsl }:
, openssl, boost, grpc, protobuf, libnsl }:
let
sqlite3 = fetchurl rec {
@ -130,7 +130,7 @@ in stdenv.mkDerivation rec {
cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"];
nativeBuildInputs = [ pkg-config cmake git ];
buildInputs = [ openssl openssl.dev boostSharedStatic grpc abseil-cpp protobuf libnsl ];
buildInputs = [ openssl openssl.dev boostSharedStatic grpc protobuf libnsl ];
preConfigure = ''
export HOME=$PWD