figsoda 2023-04-16 08:50:01 -04:00
parent f294325aed
commit bdc7b7cee9
3 changed files with 421 additions and 457 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,11 @@
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
, fetchpatch
, makeWrapper
, pkg-config
, zstd
, stdenv
, alsa-lib
, libxkbcommon
, udev
@ -15,30 +17,44 @@
rustPlatform.buildRustPackage rec {
pname = "jumpy";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "fishfolk";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vBnHNc/kCyZ8gTWhQShn4lBQECguFBzBd7xIfLBgm7A=";
sha256 = "sha256-03VPfSIlGB8Cc1jWzZSj9MBFBBmMjyx+RdHr3r3oolU=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"bevy_simple_tilemap-0.10.1" = "sha256-Q/AsBZjsr+uTIh/oN0OsIJxntZ4nuc1AReo0Ronj930=";
"bones_asset-0.1.0" = "sha256-CyP7rbS3X26xlCFxn3g9YhZze7UeqxQ1wULrZ3er7Xc=";
"bones_asset-0.1.0" = "sha256-YyY5OsbRLkpAgvNifRiXfmzfsgFw/oFV1nQVCkXG4j4=";
};
};
patches = [
# removes unused patch in patch.crates-io, which cases the build to fail
# error: failed to load source for dependency `bevy_simple_tilemap`
# Caused by: attempting to update a git repository, but --frozen was specified
./remove-unused-patch.patch
# the crate version is outdated
(fetchpatch {
name = "bump-version-to-0-6-1.patch";
url = "https://github.com/fishfolk/jumpy/commit/15081c425056cdebba1bc90bfcaba50a2e24829f.patch";
hash = "sha256-dxLfy1HMdjh2VPbqMb/kwvDxeuptFi3W9tLzvg6TLsE=";
})
];
nativeBuildInputs = [
makeWrapper
] ++ lib.optionals stdenv.isLinux [
pkg-config
];
buildInputs = lib.optionals stdenv.isLinux [
buildInputs = [
zstd
] ++ lib.optionals stdenv.isLinux [
alsa-lib
libxkbcommon
udev
@ -55,6 +71,10 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "--bin" "jumpy" ];
env = {
ZSTD_SYS_USE_PKG_CONFIG = true;
};
postInstall = ''
mkdir $out/share
cp -r assets $out/share

View File

@ -0,0 +1,22 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4977,8 +4977,3 @@ dependencies = [
"libc",
"pkg-config",
]
-
-[[patch.unused]]
-name = "bevy_simple_tilemap"
-version = "0.11.0"
-source = "git+https://github.com/forbjok/bevy_simple_tilemap.git#9a1d4332e961327443adb16aca306f837b6f4da5"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -94,8 +94,6 @@ codegen-units = 1 # Improved rapier physics perf, so it might help other stuf
lto = true
[patch.crates-io]
-bevy_simple_tilemap = { git = "https://github.com/forbjok/bevy_simple_tilemap.git" }
-
bones_lib = { git = "https://github.com/fishfolk/bones" }
bones_bevy_asset = { git = "https://github.com/fishfolk/bones" }
type_ulid = { git = "https://github.com/fishfolk/bones" }