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]>
NixOS · Jan 15, 2025 · 6be56a4 · 6be56a4
1 parent 634fd46
commit 6be56a4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -407,8 +407,10 @@ in
       ++ lib.optional (lib.versionAtLeast attrs.version "1.53.0" && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) autoSignDarwinBinariesHook;
     buildInputs = [ openssl ];
     hardeningDisable = [ "format" ];
-    env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
-    patches = [
+    env = lib.optionalAttrs (lib.versionOlder attrs.version "1.68.1") {
+      NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+    };
+    patches = lib.optionals (lib.versionOlder attrs.version "1.65.0") [
       (fetchpatch {
         name = "gcc-14-fixes.patch";
         url = "https://boringssl.googlesource.com/boringssl/+/c70190368c7040c37c1d655f0690bcde2b109a0d%5E%21/?format=TEXT";