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 da90cbe) Co-authored-by: Yihau Chen <[email protected]>
anza-xyz · Nov 21, 2024 · 93e6e33 · 93e6e33
1 parent 4f8cf99
commit 93e6e33
Showing 1 changed file with 2 additions and 6 deletions.
diff --git 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
 )