about summary refs log tree commit diff
path: root/third_party
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-06-07T16·14+0100
committerVincent Ambo <tazjin@google.com>2020-06-07T16·14+0100
commit430e60233685b1da5ace0bca88db3e7a8f5ed1b2 (patch)
treef17f6ab8e5ca3163de555c27d3bc912912ec9377 /third_party
parent4fb8788c01f2e9975d2ff1c3ac389ee8fe844a2f (diff)
feat(3p/grpc): Build gRPC using LLVM10 & libcxx r/884
Diffstat (limited to 'third_party')
-rw-r--r--third_party/default.nix3
-rw-r--r--third_party/grpc/default.nix14
2 files changed, 15 insertions, 2 deletions
diff --git a/third_party/default.nix b/third_party/default.nix
index 2286af193db3..b81c6a102f77 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -65,7 +65,6 @@ let
       go
       google-cloud-sdk
       graphviz
-      grpc
       gzip
       haskell
       iana-etc
@@ -163,7 +162,7 @@ in exposed.lib.fix(self: exposed // {
 
   # Packages to be overridden
   originals = {
-    inherit (nixpkgs) notmuch;
+    inherit (nixpkgs) grpc notmuch;
     inherit (stableNixpkgs) git;
     ffmpeg = nixpkgs.ffmpeg-full;
   };
diff --git a/third_party/grpc/default.nix b/third_party/grpc/default.nix
new file mode 100644
index 000000000000..f76467dbd651
--- /dev/null
+++ b/third_party/grpc/default.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+(pkgs.originals.grpc.override {
+  protobuf = pkgs.protobuf;
+  stdenv = pkgs.llvmPackages.libcxxStdenv;
+}).overrideAttrs(orig: {
+  buildInputs = orig.buildInputs ++ [
+    pkgs.abseil_cpp
+  ];
+
+  cmakeFlags = orig.cmakeFlags ++ [
+    "-DgRPC_ABSL_PROVIDER=package"
+  ];
+})