From 18c2645f7b64027f6470fab146708d210f011317 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 2 Aug 2019 01:48:26 -0500 Subject: grpc: 1.19.1 -> 1.22.0 --- pkgs/development/libraries/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 77773e91e174..e91d57b0cd6a 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.19.1"; + version = "1.22.0"; name = "grpc-${version}"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0c0jra4qnd86gyr4rlblic3igb5dpgrldac35myk5i5ia547fdhj"; + sha256 = "10wf9sakkxpcvc09n1h91x6slwwhxblghs4zn95klyc4m6py1gfg"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; -- cgit 1.4.1 From f2c7593c1aa37a049df0679522ede969e77f4056 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 2 Aug 2019 01:55:21 -0500 Subject: grpc: fix darwin build --- pkgs/development/libraries/grpc/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index e91d57b0cd6a..81e90154aa5b 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; # CMake creates a build directory by default, this conflicts with the -- cgit 1.4.1