From 03b85bb69740f10e11e119955758bdbe8273b3fc Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 8 May 2023 10:52:00 -0400
Subject: [PATCH] jumpy: fix build on aarch64-linux

---
 pkgs/games/jumpy/Cargo.lock            |  8 +++---
 pkgs/games/jumpy/default.nix           |  6 +++++
 pkgs/games/jumpy/update-mimalloc.patch | 37 ++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/games/jumpy/update-mimalloc.patch

diff --git a/pkgs/games/jumpy/Cargo.lock b/pkgs/games/jumpy/Cargo.lock
index be21d00f86d0..b01d46510f70 100644
--- a/pkgs/games/jumpy/Cargo.lock
+++ b/pkgs/games/jumpy/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",
 ]
diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix
index 1cab49b3d74f..8839c01085d6 100644
--- a/pkgs/games/jumpy/default.nix
+++ b/pkgs/games/jumpy/default.nix
@@ -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 = [
     makeWrapper
     pkg-config
diff --git a/pkgs/games/jumpy/update-mimalloc.patch b/pkgs/games/jumpy/update-mimalloc.patch
new file mode 100644
index 000000000000..cd602e3af1d8
--- /dev/null
+++ b/pkgs/games/jumpy/update-mimalloc.patch
@@ -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"