summary refs log tree commit diff
diff options
context:
space:
mode:
authorK900 <me@0upti.me>2023-08-17 18:48:28 +0300
committerVladimír Čunát <v@cunat.cz>2023-08-18 17:19:04 +0200
commit399769897b1f1b8b32ecadf5cb69f9cadbc009cd (patch)
treee24530c0b63cf5ebaad31c4e81d53eb623c31852
parentb0b94e82a361b60ee0ca07a2dda887059d56bb05 (diff)
downloadnixpkgs-399769897b1f1b8b32ecadf5cb69f9cadbc009cd.tar
nixpkgs-399769897b1f1b8b32ecadf5cb69f9cadbc009cd.tar.gz
nixpkgs-399769897b1f1b8b32ecadf5cb69f9cadbc009cd.tar.bz2
nixpkgs-399769897b1f1b8b32ecadf5cb69f9cadbc009cd.tar.lz
nixpkgs-399769897b1f1b8b32ecadf5cb69f9cadbc009cd.tar.xz
nixpkgs-399769897b1f1b8b32ecadf5cb69f9cadbc009cd.tar.zst
nixpkgs-399769897b1f1b8b32ecadf5cb69f9cadbc009cd.zip
grpc: fix generated config file
Taken from PR #249752
-rw-r--r--pkgs/development/libraries/grpc/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 70034f2d2e4..77bba280df9 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -40,6 +40,12 @@ stdenv.mkDerivation rec {
       url = "https://github.com/lopsided98/grpc/commit/164f55260262c816e19cd2c41b564486097d62fe.patch";
       hash = "sha256-d6kMyjL5ZnEnEz4XZfRgXJBH53gp1r7q1tlwh+HM6+Y=";
     })
+    # Fix generated CMake config file
+    # FIXME: remove when merged
+    (fetchpatch {
+      url = "https://github.com/grpc/grpc/pull/33361/commits/117dc80eb43021dd5619023ef6d02d0d6ec7ae7a.patch";
+      hash = "sha256-VBk3ZD5h9uOQVN0st+quUQK/wXqvfFNk8G8AN4f2MQo=";
+    })
   ];
 
   nativeBuildInputs = [ cmake pkg-config ]