Skip to content

Commit 6be56a4

Browse files
committed
ruby-grpc: Only apply the GCC 14 patch if it’s not upstream
It was upstreamed in v1.65.0-pre1~90; attempting to apply it again after that causes errors. Signed-off-by: Anders Kaseorg <[email protected]>
1 parent 634fd46 commit 6be56a4

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

pkgs/development/ruby-modules/gem-config/default.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,8 +407,10 @@ in
407407
++ lib.optional (lib.versionAtLeast attrs.version "1.53.0" && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) autoSignDarwinBinariesHook;
408408
buildInputs = [ openssl ];
409409
hardeningDisable = [ "format" ];
410-
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
411-
patches = [
410+
env = lib.optionalAttrs (lib.versionOlder attrs.version "1.68.1") {
411+
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
412+
};
413+
patches = lib.optionals (lib.versionOlder attrs.version "1.65.0") [
412414
(fetchpatch {
413415
name = "gcc-14-fixes.patch";
414416
url = "https://boringssl.googlesource.com/boringssl/+/c70190368c7040c37c1d655f0690bcde2b109a0d%5E%21/?format=TEXT";

0 commit comments

Comments
 (0)