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 <andersk@mit.edu>
NixOS · Dec 28, 2024 · 2ea0745 · 2ea0745
1 parent 634fd46
commit 2ea0745
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -409,14 +409,14 @@ in
     hardeningDisable = [ "format" ];
     env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
     patches = [
-      (fetchpatch {
+      (lib.optional (lib.versionOlder attrs.version "1.65.0") (fetchpatch {
         name = "gcc-14-fixes.patch";
         url = "https://boringssl.googlesource.com/boringssl/+/c70190368c7040c37c1d655f0690bcde2b109a0d%5E%21/?format=TEXT";
         decode = "base64 -d";
         stripLen=1;
         extraPrefix = "third_party/boringssl-with-bazel/src/";
         hash = "sha256-1QyQm5s55op268r72dfExNGV+UyV5Ty6boHa9DQq40U=";
-       })
+      }))
     ];
     dontBuild = false;
     postPatch = ''