Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −11
Open

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions pkgs/development/ruby-modules/gem-config/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,17 +407,17 @@ 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 = [
(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=";
})
];
env = lib.optionalAttrs (lib.versionOlder attrs.version "1.68.1") {
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
};
patches = lib.optional (lib.versionOlder attrs.version "1.65.0") (fetchpatch {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, prefer using lib.optionals instead of optional. It allows for adding new items later on with a minimal diff.

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 = ''
substituteInPlace Makefile \
Expand Down
Loading