From c3a2a238f77763c952d5301f3aabe625f71a32aa Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 1 May 2023 11:51:27 +0300 Subject: [PATCH] defaultGemConfig.grpc: update config --- pkgs/development/ruby-modules/gem-config/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index b6b1bb4b5d08..5dba1c0cf099 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -27,6 +27,7 @@ , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie , CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml +, autoSignDarwinBinariesHook }@args: let @@ -325,7 +326,9 @@ in }; grpc = attrs: { - nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin cctools; + nativeBuildInputs = [ pkg-config ] + ++ lib.optional stdenv.isDarwin cctools + ++ lib.optional (lib.versionAtLeast attrs.version "1.53.0" && stdenv.isDarwin && stdenv.isAarch64) autoSignDarwinBinariesHook; buildInputs = [ openssl ]; hardeningDisable = [ "format" ]; env.NIX_CFLAGS_COMPILE = toString [ @@ -342,7 +345,7 @@ in postPatch = '' substituteInPlace Makefile \ --replace '-Wno-invalid-source-encoding' "" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString (lib.versionOlder attrs.version "1.53.0" && stdenv.isDarwin) '' # For < v1.48.0 substituteInPlace src/ruby/ext/grpc/extconf.rb \ --replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" "" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5aefc8bacee..0af66e5258e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17085,7 +17085,7 @@ with pkgs; inherit (darwin) libobjc; }; defaultGemConfig = callPackage ../development/ruby-modules/gem-config { - inherit (darwin) DarwinTools cctools; + inherit (darwin) DarwinTools cctools autoSignDarwinBinariesHook; inherit (darwin.apple_sdk.frameworks) CoreServices; }; bundix = callPackage ../development/ruby-modules/bundix { };