feat(3p/grpc): Build gRPC using LLVM10 & libcxx
This commit is contained in:
parent
4fb8788c01
commit
430e602336
2 changed files with 15 additions and 2 deletions
3
third_party/default.nix
vendored
3
third_party/default.nix
vendored
|
@ -65,7 +65,6 @@ let
|
||||||
go
|
go
|
||||||
google-cloud-sdk
|
google-cloud-sdk
|
||||||
graphviz
|
graphviz
|
||||||
grpc
|
|
||||||
gzip
|
gzip
|
||||||
haskell
|
haskell
|
||||||
iana-etc
|
iana-etc
|
||||||
|
@ -163,7 +162,7 @@ in exposed.lib.fix(self: exposed // {
|
||||||
|
|
||||||
# Packages to be overridden
|
# Packages to be overridden
|
||||||
originals = {
|
originals = {
|
||||||
inherit (nixpkgs) notmuch;
|
inherit (nixpkgs) grpc notmuch;
|
||||||
inherit (stableNixpkgs) git;
|
inherit (stableNixpkgs) git;
|
||||||
ffmpeg = nixpkgs.ffmpeg-full;
|
ffmpeg = nixpkgs.ffmpeg-full;
|
||||||
};
|
};
|
||||||
|
|
14
third_party/grpc/default.nix
vendored
Normal file
14
third_party/grpc/default.nix
vendored
Normal file
|
@ -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"
|
||||||
|
];
|
||||||
|
})
|
Loading…
Reference in a new issue