mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
Merge pull request #229255 from wegank/ruby-grpc-fix
defaultGemConfig.grpc: update config
This commit is contained in:
commit
ac9d5d0bf1
@ -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/" ""
|
||||
|
@ -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 { };
|
||||
|
Loading…
Reference in New Issue
Block a user