about summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2019-08-04 14:23:27 -0500
committerGitHub <noreply@github.com>2019-08-04 14:23:27 -0500
commit9b122174aa70b49cdcd4b66ea98a1f62a7388a49 (patch)
tree3ea00cb93606aa6e1f457e299aeccfc32ca398b4 /pkgs/development/libraries
parent769de8c47551c4f7a3175534a4586c53d214644a (diff)
parent368d8bb02e953cc6845a50c71ee6ce4c9432b840 (diff)
downloadnixlib-9b122174aa70b49cdcd4b66ea98a1f62a7388a49.tar
nixlib-9b122174aa70b49cdcd4b66ea98a1f62a7388a49.tar.gz
nixlib-9b122174aa70b49cdcd4b66ea98a1f62a7388a49.tar.bz2
nixlib-9b122174aa70b49cdcd4b66ea98a1f62a7388a49.tar.lz
nixlib-9b122174aa70b49cdcd4b66ea98a1f62a7388a49.tar.xz
nixlib-9b122174aa70b49cdcd4b66ea98a1f62a7388a49.tar.zst
nixlib-9b122174aa70b49cdcd4b66ea98a1f62a7388a49.zip
Merge pull request #65770 from marsam/update-grpc
grpc: 1.19.1 -> 1.22.0
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/grpc/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 77773e91e174..81e90154aa5b 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 ];
@@ -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