From 6be56a42903ecd329ef655e898fde9d123393ac3 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 27 Dec 2024 22:09:58 -0800 Subject: [PATCH] =?UTF-8?q?ruby-grpc:=20Only=20apply=20the=20GCC=2014=20pa?= =?UTF-8?q?tch=20if=20it=E2=80=99s=20not=20upstream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was upstreamed in v1.65.0-pre1~90; attempting to apply it again after that causes errors. Signed-off-by: Anders Kaseorg --- pkgs/development/ruby-modules/gem-config/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index b6542ebeccc29..b93cdcc2134d3 100644 --- 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";