aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/development/libraries/grpc/default.nix
diff options
context:
space:
mode:
authorMx Kookie <kookie@spacekookie.de>2020-12-09 18:55:19 +0000
committerMx Kookie <kookie@spacekookie.de>2020-12-09 18:55:19 +0000
commit80d90d9b204f7c17912740f9f414fe5d59f293ba (patch)
tree5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/libraries/grpc/default.nix
parent3a31a84c7d3e589035ad08499206aac44a81f424 (diff)
parent83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff)
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/grpc/default.nix')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/libraries/grpc/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/grpc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/grpc/default.nix
index e7d1aa4bf92b..c41bd5ff5aa3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/libraries/grpc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/grpc/default.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- version = "1.32.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
+ version = "1.34.0"; # 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 = "0v48h0j0gxcp9s63z1ibwgz4416qd6iq728la80y6gl8rklrqf0c";
+ sha256 = "0kipk26kg2x06mrkhb74k8vk5cn4mr89kw1f9mb04n616wkxjyxy";
fetchSubmodules = true;
};
patches = [
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake pkgconfig ];
- buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp libnsl ];
+ buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ]
+ ++ stdenv.lib.optionals stdenv.isLinux [ libnsl ];
cmakeFlags =
[ "-DgRPC_ZLIB_PROVIDER=package"