diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/grpc')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/grpc/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix index d6a1b44fe426..5cdd9886690a 100644 --- a/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf -, gflags, libnsl +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf +, gflags, abseil-cpp, libnsl }: stdenv.mkDerivation rec { - version = "1.35.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.36.4"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0vxgp3kqxsglavzs91ybpkkh7aaywxcryacp5z3z6dpsgmw0mscd"; + sha256 = "1zxvdg5vgjgkq5wmzwbxj2zydaj90ja074axs26yzd9x08j0bjxz"; fetchSubmodules = true; }; patches = [ @@ -21,17 +21,21 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ] + propagatedBuildInputs = [ c-ares re2 zlib abseil-cpp ]; + buildInputs = [ c-ares.cmake-config openssl protobuf gflags ] ++ lib.optionals stdenv.isLinux [ libnsl ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" "-DgRPC_CARES_PROVIDER=package" + "-DgRPC_RE2_PROVIDER=package" "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" + "-DgRPC_ABSL_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DCMAKE_CXX_STANDARD=17" ]; # CMake creates a build directory by default, this conflicts with the |