From 38b0717d50094314dc703059cceb97f81b63a2e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 9 Apr 2019 21:34:51 +0200 Subject: [PATCH 1/2] grpc: 1.19.0 -> 1.19.1 --- pkgs/development/libraries/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 93e76c62182..e570d8c447a 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 ]; From 93d61e5c23de9e752b5ca43aa37d451fd098ba88 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 9 Apr 2019 21:35:12 +0200 Subject: [PATCH 2/2] grpc: build shared libs, fixes #58375 --- pkgs/development/libraries/grpc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index e570d8c447a..77773e91e17 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -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;