diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2019-04-24 22:10:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-24 22:10:08 +0200 |
| commit | bd44e3a46d90690dd792f6d9d1354ae4edca9a5a (patch) | |
| tree | 6d8c4a4188f43c40df9a476ce6a34f1cd4385079 /pkgs/development/libraries | |
| parent | d77256c604ace31a7940625cea2b28d5c12edf1a (diff) | |
| parent | 93d61e5c23de9e752b5ca43aa37d451fd098ba88 (diff) | |
| download | nixlib-bd44e3a46d90690dd792f6d9d1354ae4edca9a5a.tar nixlib-bd44e3a46d90690dd792f6d9d1354ae4edca9a5a.tar.gz nixlib-bd44e3a46d90690dd792f6d9d1354ae4edca9a5a.tar.bz2 nixlib-bd44e3a46d90690dd792f6d9d1354ae4edca9a5a.tar.lz nixlib-bd44e3a46d90690dd792f6d9d1354ae4edca9a5a.tar.xz nixlib-bd44e3a46d90690dd792f6d9d1354ae4edca9a5a.tar.zst nixlib-bd44e3a46d90690dd792f6d9d1354ae4edca9a5a.zip | |
Merge pull request #59232 from FRidh/grpc
grpc: update version and build shared libs
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/grpc/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 93e76c621822..77773e91e174 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.0"; + version = "1.19.1"; name = "grpc-${version}"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "105hvpn2z3qiyc01wyzpmfbrpmy20kz1nb9j1c2s0kz1r0v92gqi"; + sha256 = "0c0jra4qnd86gyr4rlblic3igb5dpgrldac35myk5i5ia547fdhj"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" + "-DBUILD_SHARED_LIBS=ON" ]; # CMake creates a build directory by default, this conflicts with the @@ -26,6 +27,10 @@ stdenv.mkDerivation rec { rm -vf BUILD ''; + preBuild = '' + export LD_LIBRARY_PATH=$(pwd):$LD_LIBRARY_PATH + ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option"; enableParallelBuilds = true; |