mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-02 18:47:58 +03:00
Merge pull request #182151 from amarshall/ruby-grpc-fix
defaultGemConfig.grpc: Fix build on v1.48.0+
This commit is contained in:
commit
bafd04616f
@ -321,8 +321,12 @@ in
|
|||||||
substituteInPlace Makefile \
|
substituteInPlace Makefile \
|
||||||
--replace '-Wno-invalid-source-encoding' ""
|
--replace '-Wno-invalid-source-encoding' ""
|
||||||
'' + lib.optionalString stdenv.isDarwin ''
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
|
# 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/" ""
|
||||||
|
# For >= v1.48.0
|
||||||
|
substituteInPlace src/ruby/ext/grpc/extconf.rb \
|
||||||
|
--replace 'apple_toolchain = ' 'apple_toolchain = false && '
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user