dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #229255 from wegank/ruby-grpc-fix

Browse Source 
defaultGemConfig.grpc: update config
This commit is contained in:
Weijia Wang 2023-05-01 12:48:43 +03:00 committed by GitHub
commit ac9d5d0bf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -27,6 +27,7 @@
, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
, bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie , bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie
, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml , CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml
, autoSignDarwinBinariesHook
}@args: }@args:
let let
@ -325,7 +326,9 @@ in
}; };
grpc = attrs: { 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 ]; buildInputs = [ openssl ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
env.NIX_CFLAGS_COMPILE = toString [ env.NIX_CFLAGS_COMPILE = toString [
@ -342,7 +345,7 @@ in
postPatch = '' postPatch = ''
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace '-Wno-invalid-source-encoding' "" --replace '-Wno-invalid-source-encoding' ""
'' + lib.optionalString stdenv.isDarwin '' '' + lib.optionalString (lib.versionOlder attrs.version "1.53.0" && stdenv.isDarwin) ''
# For < v1.48.0 # For < v1.48.0
substituteInPlace src/ruby/ext/grpc/extconf.rb \ substituteInPlace src/ruby/ext/grpc/extconf.rb \
--replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" "" --replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" ""

2
pkgs/top-level/all-packages.nix
View File

@ -17085,7 +17085,7 @@ with pkgs;
inherit (darwin) libobjc; inherit (darwin) libobjc;
}; };
defaultGemConfig = callPackage ../development/ruby-modules/gem-config { defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
inherit (darwin) DarwinTools cctools; inherit (darwin) DarwinTools cctools autoSignDarwinBinariesHook;
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
}; };
bundix = callPackage ../development/ruby-modules/bundix { }; bundix = callPackage ../development/ruby-modules/bundix { };