summary refs log tree commit diff
path: root/pkgs/development/ruby-modules
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2022-07-24 09:44:09 +0200
committerVladimír Čunát <v@cunat.cz>2022-07-24 09:44:09 +0200
commit4ba8bc7d4057c415352c127a94f8c1eeeb43398d (patch)
tree6315822967825db4ecc1e38dd333fb5ad9df5a74 /pkgs/development/ruby-modules
parent6629a2339e11b8a63878361ead0583fb4359f886 (diff)
parente494a908e8895b9cba18e21d5fc83362f64b3f6a (diff)
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/ruby-modules')
-rw-r--r--pkgs/development/ruby-modules/gem-config/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 6f9da13f50342..5a6d885159a57 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -321,8 +321,12 @@ in
       substituteInPlace Makefile \
         --replace '-Wno-invalid-source-encoding' ""
     '' + lib.optionalString stdenv.isDarwin ''
+      # For < v1.48.0
       substituteInPlace src/ruby/ext/grpc/extconf.rb \
         --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 && '
     '';
   };