uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
61
pkgs/games/fishfight/default.nix
Normal file
61
pkgs/games/fishfight/default.nix
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, SDL2
|
||||
, alsa-lib
|
||||
, libGL
|
||||
, libX11
|
||||
, libXi
|
||||
, AudioToolbox
|
||||
, Cocoa
|
||||
, CoreAudio
|
||||
, OpenGL
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fishfight";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fishfight";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kLdk7zTICZ8iawNttTsWUVKGvh2zykXVsMqUyYoGrBs=";
|
||||
};
|
||||
|
||||
# use system sdl2 instead of bundled sdl2
|
||||
cargoPatches = [ ./use-system-sdl2.patch ];
|
||||
|
||||
cargoSha256 = "sha256-KQiqUzdsVMIjDmmreihekrrFoXeyNzd6ZbqApwH8B4Q=";
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
alsa-lib
|
||||
libGL
|
||||
libX11
|
||||
libXi
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AudioToolbox
|
||||
Cocoa
|
||||
CoreAudio
|
||||
OpenGL
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/main.rs --replace ./assets $out/share/assets
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out/share
|
||||
cp -r assets $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tactical 2D shooter played by up to 4 players online or on a shared screen";
|
||||
homepage = "https://fishfight.org/";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
39
pkgs/games/fishfight/use-system-sdl2.patch
Normal file
39
pkgs/games/fishfight/use-system-sdl2.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -96,15 +96,6 @@ version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
-[[package]]
|
||||
-name = "cmake"
|
||||
-version = "0.1.46"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "b7b858541263efe664aead4a5209a4ae5c5d2811167d4ed4ee0944503f8d2089"
|
||||
-dependencies = [
|
||||
- "cc",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "color_quant"
|
||||
version = "1.1.0"
|
||||
@@ -605,7 +596,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "94cb479353c0603785c834e2307440d83d196bf255f204f7f6741358de8d6a2f"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
- "cmake",
|
||||
"libc",
|
||||
"version-compare",
|
||||
]
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index d2af29e..a813f30 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -14,7 +14,7 @@ macroquad-profiler = "0.1"
|
||||
|
||||
ff-particles = { version = "0.1", features = ["serde"] }
|
||||
|
||||
-fishsticks = { version = "0.2.0", features = ["bundled-sdl2"] }
|
||||
+fishsticks = "0.2.0"
|
||||
|
||||
stunclient = { git = "https://github.com/not-fl3/rust-stunclient", default-features = false }
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue