diff options
| -rw-r--r-- | ci-builds.nix | 1 | ||||
| -rw-r--r-- | third_party/grpc/default.nix | 18 |
2 files changed, 14 insertions, 5 deletions
diff --git a/ci-builds.nix b/ci-builds.nix index a99ecd7db0..5ef6e58e0c 100644 --- a/ci-builds.nix +++ b/ci-builds.nix @@ -63,6 +63,7 @@ in lib.fix (self: { third_party = with depot.third_party; [ cgit git + grpc nix openldap ]; diff --git a/third_party/grpc/default.nix b/third_party/grpc/default.nix index f76467dbd6..a3745a2099 100644 --- a/third_party/grpc/default.nix +++ b/third_party/grpc/default.nix @@ -1,14 +1,22 @@ { pkgs, ... }: (pkgs.originals.grpc.override { + abseil-cpp = pkgs.abseil_cpp; protobuf = pkgs.protobuf; stdenv = pkgs.llvmPackages.libcxxStdenv; -}).overrideAttrs(orig: { - buildInputs = orig.buildInputs ++ [ - pkgs.abseil_cpp - ]; +}).overrideAttrs(orig: rec { + version = "1.30.0"; + + src = pkgs.fetchFromGitHub { + owner = "grpc"; + repo = "grpc"; + rev = "v${version}"; + sha256 = "01w5jdp318i7ncxbkfv75q0mf0rd3qwfr1ycdd3850nv6mprv7n0"; + fetchSubmodules = true; + }; cmakeFlags = orig.cmakeFlags ++ [ - "-DgRPC_ABSL_PROVIDER=package" + "-DCMAKE_CXX_STANDARD=17" + "-DCMAKE_CXX_STANDARD_REQUIRED=ON" ]; }) |