diff options
author | Tobias Mayer <tobim@fastmail.fm> | 2023-08-14 08:57:36 +0200 |
---|---|---|
committer | Tobias Mayer <tobim@fastmail.fm> | 2023-08-14 11:50:30 +0200 |
commit | 54e9994a6b5f48d761f1dc6cefbe9c14f4ddda50 (patch) | |
tree | 20867a401465b432bbec127a9f9796d9bfe403c4 /pkgs/development/libraries/google-cloud-cpp/default.nix | |
parent | 69ea1516caa6cd439b7b3d1ee9b60c05897d205c (diff) | |
download | nixpkgs-54e9994a6b5f48d761f1dc6cefbe9c14f4ddda50.tar nixpkgs-54e9994a6b5f48d761f1dc6cefbe9c14f4ddda50.tar.gz nixpkgs-54e9994a6b5f48d761f1dc6cefbe9c14f4ddda50.tar.bz2 nixpkgs-54e9994a6b5f48d761f1dc6cefbe9c14f4ddda50.tar.lz nixpkgs-54e9994a6b5f48d761f1dc6cefbe9c14f4ddda50.tar.xz nixpkgs-54e9994a6b5f48d761f1dc6cefbe9c14f4ddda50.tar.zst nixpkgs-54e9994a6b5f48d761f1dc6cefbe9c14f4ddda50.zip |
grpc: refactor cxxStandard selection
GRPC is less aggressive in overriding `CMAKE_CXX_STANDARD` nowadays. This allows us to take a less invasive approach to ensure that the provided abseil package is configured with the same implementation for the provided c++17 compatibility shims. Instead of always setting `CMAKE_CXX_STANDARD`, we only do it to override hard-coded downgrade on darwin. With that, we can use the default configuration for abseil-cpp, reducing the number of instances of that library in the build closure to one.
Diffstat (limited to 'pkgs/development/libraries/google-cloud-cpp/default.nix')
-rw-r--r-- | pkgs/development/libraries/google-cloud-cpp/default.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index f285aee0b7c..9aa1284bbee 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -120,7 +120,6 @@ stdenv.mkDerivation rec { # this adds a good chunk of time to the build "-DBUILD_TESTING:BOOL=ON" "-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF" - "-DCMAKE_CXX_STANDARD=${grpc.cxxStandard}" ] ++ lib.optionals (apis != [ "*" ]) [ "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}" ]; |