Skip to content

Commit 401966c

Browse files
authored
Prefer MSRV-compatible deps in the ubrn build (#1797)
2 parents 00d6c84 + 834dd1b commit 401966c

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

payjoin-ffi/javascript/scripts/generate_bindings.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ if [[ $OS == "Darwin" && -z ${IN_NIX_SHELL:-} ]]; then
1414
echo "LLVM flags set: AR=$AR, CC=$CC"
1515
fi
1616

17-
# Heinous hack to pin a transitive dependency to be MSRV compatible on 1.85
18-
cd node_modules/uniffi-bindgen-react-native
19-
cargo add home@=0.5.11 --package uniffi-bindgen-react-native
20-
cd ../..
17+
# The ubrn command is compiled from source during the build below, from a
18+
# workspace that ships no lock file, so cargo resolves it fresh every run and
19+
# picks up crates whose MSRV has moved past this shell's toolchain. Ask cargo
20+
# to prefer versions compatible with the rustc in use instead of pinning each
21+
# drifting crate by hand.
22+
export CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS=fallback
2123

2224
# rustup target add is a no-op against a nix-provided toolchain
2325
# (no rustup home, targets baked into the nix derivation instead).

0 commit comments

Comments
 (0)