From dafc95dd8f460986e7631c7dfc014fa656adbf40 Mon Sep 17 00:00:00 2001 From: Branch Vincent Date: Sun, 21 Jul 2024 18:46:07 -0700 Subject: [PATCH] signal-cli: use `rustup` --- Formula/s/signal-cli.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Formula/s/signal-cli.rb b/Formula/s/signal-cli.rb index de2c34d6f009..9db35d291e1d 100644 --- a/Formula/s/signal-cli.rb +++ b/Formula/s/signal-cli.rb @@ -19,10 +19,8 @@ class SignalCli < Formula depends_on "cmake" => :build # For `boring-sys` crate in `libsignal-client` depends_on "gradle" => :build depends_on "protobuf" => :build - # the libsignal-client build targets a specific rustc listed in the file + # libsignal-client requires a specific version of rustc # https://github.com/signalapp/libsignal/blob/#{libsignal-client.version}/rust-toolchain - # which doesn't automatically happen if we use brew-installed rust. rustup-init - # allows us to use a toolchain that lives in HOMEBREW_CACHE depends_on "rustup-init" => :build depends_on "openjdk@21" @@ -47,10 +45,6 @@ def install (libexec/"bin/signal-cli.bat").unlink (bin/"signal-cli").write_env_script libexec/"bin/signal-cli", Language::Java.overridable_java_home_env("21") - # this will install the necessary cargo/rustup toolchain bits in HOMEBREW_CACHE - system Formula["rustup-init"].bin/"rustup-init", "-qy", "--no-modify-path" - ENV.prepend_path "PATH", HOMEBREW_CACHE/"cargo_cache/bin" - resource("libsignal-client").stage do |r| # https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal#manual-build