jumpy: 0.7.0 -> 0.8.0
Diff: https://github.com/fishfolk/jumpy/compare/v0.7.0...v0.8.0 Changelog: https://github.com/fishfolk/jumpy/releases/tag/v0.8.0
This commit is contained in:
parent
a367f2c9f6
commit
faa4f137d7
3 changed files with 1588 additions and 2194 deletions
3723
pkgs/games/jumpy/Cargo.lock
generated
3723
pkgs/games/jumpy/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -16,29 +16,24 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "jumpy";
|
pname = "jumpy";
|
||||||
version = "0.7.0";
|
version = "0.8.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fishfolk";
|
owner = "fishfolk";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-krO/iPGnzXeY3W8xSFerlKa1DvDl7ss00bGaAMkHUtw=";
|
sha256 = "sha256-ggePJH2kKJ17aOWRKUnLyolIdSzlc6Axf5Iw74iFfek=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoLock = {
|
cargoLock = {
|
||||||
lockFile = ./Cargo.lock;
|
lockFile = ./Cargo.lock;
|
||||||
outputHashes = {
|
outputHashes = {
|
||||||
"bevy_simple_tilemap-0.10.1" = "sha256-Q/AsBZjsr+uTIh/oN0OsIJxntZ4nuc1AReo0Ronj930=";
|
"bevy_egui-0.21.0" = "sha256-hu55tZQppw1NajwqIsYsw6de0IAwQwgra3D9OFzSSLc=";
|
||||||
"bones_asset-0.1.0" = "sha256-YyY5OsbRLkpAgvNifRiXfmzfsgFw/oFV1nQVCkXG4j4=";
|
"bones_asset-0.3.0" = "sha256-1UeOXW6O/gMQBBUnHxRreJgmiUTPC5SJB+uLn9V8aa4=";
|
||||||
|
"kira-0.8.5" = "sha256-z4R5aIaoRQQprL6JsVrFI69rwTOsW5OH01+jORS+hBQ=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
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
|
||||||
|
@ -57,7 +52,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
xorg.libXi
|
xorg.libXi
|
||||||
xorg.libXrandr
|
xorg.libXrandr
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
darwin.apple_sdk.frameworks.Cocoa
|
darwin.apple_sdk_11_0.frameworks.Cocoa
|
||||||
rustPlatform.bindgenHook
|
rustPlatform.bindgenHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -67,11 +62,12 @@ rustPlatform.buildRustPackage rec {
|
||||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# jumpy only loads assets from the current directory
|
||||||
|
# https://github.com/fishfolk/bones/blob/f84d07c2f2847d9acd5c07098fe1575abc496400/framework_crates/bones_asset/src/io.rs#L50
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mkdir $out/share
|
mkdir $out/share
|
||||||
cp -r assets $out/share
|
cp -r assets $out/share
|
||||||
wrapProgram $out/bin/jumpy \
|
wrapProgram $out/bin/jumpy --chdir $out/share
|
||||||
--set-default JUMPY_ASSET_DIR $out/share/assets
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postFixup = lib.optionalString stdenv.isLinux ''
|
postFixup = lib.optionalString stdenv.isLinux ''
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
--- 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"
|
|
Loading…
Reference in a new issue