diff options
| author | Phillip Cloud <417981+cpcloud@users.noreply.github.com> | 2021-10-31 06:06:06 -0400 |
|---|---|---|
| committer | Phillip Cloud <417981+cpcloud@users.noreply.github.com> | 2021-11-01 11:50:37 -0400 |
| commit | f506ecdca92d55c99fc3b8d8c7ef2f03218f9386 (patch) | |
| tree | 46b00833d47f88cac3c55ccbd258a1797e36204d /pkgs/development/libraries/grpc | |
| parent | 1a590c529c847207e510fc614fb790f6bebb25ad (diff) | |
all-packages: pass cxxStandard to or-tools
Diffstat (limited to 'pkgs/development/libraries/grpc')
| -rw-r--r-- | pkgs/development/libraries/grpc/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index d155826042c86..8cd26ab31052e 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -59,8 +59,7 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=OFF" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" - ] ++ lib.optionals - ((stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0") [ + ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0") [ # Needs to be compiled with -std=c++11 for clang < 11. Interestingly this is # only an issue with the useLLVM stdenv, not the darwin stdenv… # https://github.com/grpc/grpc/issues/26473#issuecomment-860885484 |