gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ruby-grpc: Only apply the GCC 14 patch if it’s not upstream

Browse Source 
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>
This commit is contained in:
Anders Kaseorg
2025-01-15 02:21:00 -05:00
parent 634fd46801
commit 6be56a4290
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ruby-modules/gem-config/default.nix
+4 -2
View File
@@ -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";