jumpy: fix build on aarch64-linux

This commit is contained in:
figsoda 2023-05-08 10:52:00 -04:00
parent cb0f64e45d
commit 03b85bb697
3 changed files with 47 additions and 4 deletions

View File

@ -2945,9 +2945,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
[[package]] [[package]]
name = "libmimalloc-sys" name = "libmimalloc-sys"
version = "0.1.31" version = "0.1.33"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef2c45001fb108f37d41bed8efd715769acb14674c1ce3e266ef0e317ef5f877" checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
@ -3117,9 +3117,9 @@ dependencies = [
[[package]] [[package]]
name = "mimalloc" name = "mimalloc"
version = "0.1.35" version = "0.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92666043c712f7f5c756d07443469ddcda6dd971cc15258bb7f3c3216fd1b7aa" checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98"
dependencies = [ dependencies = [
"libmimalloc-sys", "libmimalloc-sys",
] ]

View File

@ -33,6 +33,12 @@ rustPlatform.buildRustPackage rec {
}; };
}; };
patches = [
# jumpy uses an outdated version of mimalloc
# which fails to build on aarch64-linux
./update-mimalloc.patch
];
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
pkg-config pkg-config

View File

@ -0,0 +1,37 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2945,9 +2945,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
[[package]]
name = "libmimalloc-sys"
-version = "0.1.31"
+version = "0.1.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2c45001fb108f37d41bed8efd715769acb14674c1ce3e266ef0e317ef5f877"
+checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e"
dependencies = [
"cc",
"libc",
@@ -3117,9 +3117,9 @@ dependencies = [
[[package]]
name = "mimalloc"
-version = "0.1.35"
+version = "0.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92666043c712f7f5c756d07443469ddcda6dd971cc15258bb7f3c3216fd1b7aa"
+checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98"
dependencies = [
"libmimalloc-sys",
]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,7 @@ web-sys = { version = "0.3", features = ["Window", "Location", "Storage"] }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
bevy_dylib = "0.9.1"
-mimalloc = { version = "0.1.32", default-features = false }
+mimalloc = { version = "0.1.37", default-features = false }
# Networking deps
ggrs = { version = "0.9.3", features = ["sync-send"] }
bitfield = "0.14.0"