diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-09-11 21:56:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-11 21:56:57 -0500 |
| commit | 22eb66041762351ddf29af582f1e7e177d1c8487 (patch) | |
| tree | d76dcc9cff6788e86c703951040e0d8584e1ec08 /pkgs/development | |
| parent | 07109dd495bd3e8b6ef39d737d93b7e721b06ff3 (diff) | |
| parent | d126476d4060d997bfb440d2fa3756eca3feeefa (diff) | |
Merge pull request #137456 from marsam/grpc-abseil-mutex-patch
grpc: add patch to revert alias to abseil mutex
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/grpc/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 72c584d0fd472..4a9fce04214f1 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -33,6 +33,13 @@ stdenv.mkDerivation rec { url = "https://github.com/grpc/grpc/commit/2f4cf1d9265c8e10fb834f0794d0e4f3ec5ae10e.patch"; sha256 = "0ams3jmgh9yzwmxcg4ifb34znamr7pb4qm0609kvil9xqvkqz963"; }) + + # Revert gRPC C++ Mutex to be an alias of Abseil, because it breaks dependent packages + (fetchpatch { + url = "https://github.com/grpc/grpc/commit/931f91b745cd5b2864a0d1787815871d0bd844ae.patch"; + sha256 = "0vc93g2i4982ys4gzyaxdv9ni25yk10sxq3n7fkz8dypy8sylck7"; + revert = true; + }) ]; nativeBuildInputs = [ cmake pkg-config ] |