From 93e6e33ea5bec52eaf71cec8cacc12fd81e85e6d Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 21 Nov 2024 13:13:32 +0800
Subject: [PATCH] v2.0: remove ntapi patch (backport of #3584) (#3665)

remove ntapi patch (#3584)

* use anza-xyz/ntapi instead of the labs one

* remove ntapi patch

* fix shellcheck

(cherry picked from commit da90cbee49d0e08d5124f0888d82b2f6774c27be)

Co-authored-by: Yihau Chen <yihau.chen@icloud.com>
---
 scripts/cargo-install-all.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh
index 029b1fbf27..fd70b70f80 100755
--- a/scripts/cargo-install-all.sh
+++ b/scripts/cargo-install-all.sh
@@ -153,12 +153,8 @@ mkdir -p "$installDir/bin"
     # shellcheck source=scripts/spl-token-cli-version.sh
     source "$SOLANA_ROOT"/scripts/spl-token-cli-version.sh
 
-    # the patch-related configs are needed for rust 1.69+ on Windows; see Cargo.toml
-    # shellcheck disable=SC2086 # Don't want to double quote $rust_version
-    "$cargo" $maybeRustVersion \
-      --config 'patch.crates-io.ntapi.git="https://github.com/solana-labs/ntapi"' \
-      --config 'patch.crates-io.ntapi.rev="97ede981a1777883ff86d142b75024b023f04fad"' \
-      install --locked spl-token-cli --root "$installDir" $maybeSplTokenCliVersionArg
+    # shellcheck disable=SC2086
+    "$cargo" $maybeRustVersion install --locked spl-token-cli --root "$installDir" $maybeSplTokenCliVersionArg
   fi
 )