diff options
author | figsoda <figsoda@pm.me> | 2023-10-16 13:04:42 -0400 |
---|---|---|
committer | figsoda <figsoda@pm.me> | 2023-10-19 10:13:34 -0400 |
commit | faa4f137d7fbc4543352143f88246f946944db25 (patch) | |
tree | a8ec851c4367cfe891ff689c4ff8bf97ceff83f9 /pkgs/games/jumpy/default.nix | |
parent | a367f2c9f6827394350fc95aa1a8ad773e01ed02 (diff) |
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
Diffstat (limited to 'pkgs/games/jumpy/default.nix')
-rw-r--r-- | pkgs/games/jumpy/default.nix | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix index 8839c01085d6f..d4f8a8fcbdbc9 100644 --- a/pkgs/games/jumpy/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -16,29 +16,24 @@ rustPlatform.buildRustPackage rec { pname = "jumpy"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "fishfolk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-krO/iPGnzXeY3W8xSFerlKa1DvDl7ss00bGaAMkHUtw="; + sha256 = "sha256-ggePJH2kKJ17aOWRKUnLyolIdSzlc6Axf5Iw74iFfek="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "bevy_simple_tilemap-0.10.1" = "sha256-Q/AsBZjsr+uTIh/oN0OsIJxntZ4nuc1AReo0Ronj930="; - "bones_asset-0.1.0" = "sha256-YyY5OsbRLkpAgvNifRiXfmzfsgFw/oFV1nQVCkXG4j4="; + "bevy_egui-0.21.0" = "sha256-hu55tZQppw1NajwqIsYsw6de0IAwQwgra3D9OFzSSLc="; + "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 = [ makeWrapper pkg-config @@ -57,7 +52,7 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libXrandr ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk_11_0.frameworks.Cocoa rustPlatform.bindgenHook ]; @@ -67,11 +62,12 @@ rustPlatform.buildRustPackage rec { 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 = '' mkdir $out/share cp -r assets $out/share - wrapProgram $out/bin/jumpy \ - --set-default JUMPY_ASSET_DIR $out/share/assets + wrapProgram $out/bin/jumpy --chdir $out/share ''; postFixup = lib.optionalString stdenv.isLinux '' |