diff options
| author | Andrew Marshall <andrew@johnandrewmarshall.com> | 2022-07-19 19:26:08 -0400 |
|---|---|---|
| committer | Andrew Marshall <andrew@johnandrewmarshall.com> | 2022-07-19 19:32:19 -0400 |
| commit | ffd3da44f346f8b7fa2c07761459389904098b1c (patch) | |
| tree | e33b9b20621a6285a4527248dcb3209eba4ffc13 /pkgs/development/ruby-modules | |
| parent | ec5b1456725164f4ce3ae8a5b11bc382b2be272a (diff) | |
defaultGemConfig.grpc: Fix build on v1.48.0+
Upstream commit 0a5d9828c1f6b32e8462a00029b1ba2a720c867b changed how the extension build script detects an Apple toolchain; adjust accordingly by forcing it to be false. Keep both fixes so this is more compatible.
Diffstat (limited to 'pkgs/development/ruby-modules')
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 4 |
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 && ' ''; }; |