about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2022-07-23 19:59:40 -0500
committerGitHub <noreply@github.com>2022-07-23 19:59:40 -0500
commitbafd04616fa36ad8d2640da87cb225b8df487582 (patch)
treee940db9b56fecfc2bdeeccc670b64fff0a53208e /pkgs/development
parentfe5f232c53bb10bb83a04c5b58ab78bfaac1908c (diff)
parentffd3da44f346f8b7fa2c07761459389904098b1c (diff)
Merge pull request #182151 from amarshall/ruby-grpc-fix
defaultGemConfig.grpc: Fix build on v1.48.0+
Diffstat (limited to 'pkgs/development')
-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 && '
     '';
   };