Skip to content

Commit b9ed245

Browse files
authored
ruby-grpc: Only apply the GCC 14 patch if it’s not upstream (#368732)
2 parents 3ed1d83 + 6be56a4 commit b9ed245

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
@@ -410,8 +410,10 @@ in
410410
++ lib.optional (lib.versionAtLeast attrs.version "1.53.0" && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) autoSignDarwinBinariesHook;
411411
buildInputs = [ openssl ];
412412
hardeningDisable = [ "format" ];
413-
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
414-
patches = [
413+
env = lib.optionalAttrs (lib.versionOlder attrs.version "1.68.1") {
414+
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
415+
};
416+
patches = lib.optionals (lib.versionOlder attrs.version "1.65.0") [
415417
(fetchpatch {
416418
name = "gcc-14-fixes.patch";
417419
url = "https://boringssl.googlesource.com/boringssl/+/c70190368c7040c37c1d655f0690bcde2b109a0d%5E%21/?format=TEXT";

0 commit comments

Comments
 (0)