nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

grpc: 1.62.1 -> 1.66.1

Browse Source 
Diff: https://github.com/grpc/grpc/compare/v1.62.1...v1.66.1

Changelog: https://github.com/grpc/grpc/releases/tag/v1.66.1
This commit is contained in:
Robert Rose 2024-08-28 09:44:41 +02:00
parent 0230ab17b8
commit 7f39165cca
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/grpc/default.nix
View File

@ -21,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "grpc";
version = "1.62.1"; # N.B: if you change this, please update:
version = "1.66.1"; # N.B: if you change this, please update:
# pythonPackages.grpcio-tools
# pythonPackages.grpcio-status
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
hash = "sha256-L0bn6Bg36UKIRxznH9o4T7WXUqMwFjr8ybeQfbUi8xM=";
hash = "sha256-CmQUUbIYPWRS7q7OX+TmkTvoqtJAUEwhL/lev8JdB8U=";
fetchSubmodules = true;
};
@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch";
hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8=";
})
];
# fix build of 1.63.0 and newer on darwin: https://github.com/grpc/grpc/issues/36654
] ++ (lib.optional stdenv.hostPlatform.isDarwin ./dynamic-lookup-darwin.patch);
nativeBuildInputs = [ cmake pkg-config ]
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) grpc;

11
pkgs/development/libraries/grpc/dynamic-lookup-darwin.patch Normal file
View File

@ -0,0 +1,11 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 053b9e3784..0979b504da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38083,3 +38083,6 @@ generate_pkgconfig(
"-lgrpcpp_otel_plugin"
"-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
"grpcpp_otel_plugin.pc")
+
+target_link_options(upb_textformat_lib PRIVATE -Wl,-undefined,dynamic_lookup)
+target_link_options(upb_json_lib PRIVATE -Wl,-undefined,dynamic_lookup)