lol

Merge pull request #206152 from figsoda/jumpy

jumpy: 0.4.3 -> 0.5.1

authored by

figsoda and committed by
GitHub
084fd690 2df9e98e

+33 -20
+32 -17
pkgs/games/jumpy/default.nix
··· 2 , rustPlatform 3 , fetchFromGitHub 4 , stdenv 5 , pkg-config 6 , alsa-lib 7 - , libGL 8 , xorg 9 - , udev 10 - , Cocoa 11 - , OpenGL 12 }: 13 14 rustPlatform.buildRustPackage rec { 15 pname = "jumpy"; 16 - version = "0.4.3"; 17 18 src = fetchFromGitHub { 19 - owner = "fishfolks"; 20 repo = pname; 21 rev = "v${version}"; 22 - sha256 = "sha256-01zhiQi6v/8ZajsdBU+4hKUCj+PRJ/vUHluOIzy/Gi8="; 23 }; 24 25 - cargoSha256 = "sha256-AXaGuRqSFiq+Uiy+UaqPdPVyDhCogC64KZZ0Ah1Yo7A="; 26 27 - nativeBuildInputs = lib.optionals stdenv.isLinux [ 28 pkg-config 29 ]; 30 31 buildInputs = lib.optionals stdenv.isLinux [ 32 alsa-lib 33 - libGL 34 xorg.libX11 35 xorg.libXi 36 - udev 37 ] ++ lib.optionals stdenv.isDarwin [ 38 - Cocoa 39 - OpenGL 40 ]; 41 42 postPatch = '' 43 - substituteInPlace src/main.rs \ 44 - --replace ./assets $out/share/assets \ 45 - --replace ./mods $out/share/mods 46 ''; 47 48 postInstall = '' 49 mkdir $out/share 50 - cp -r assets mods $out/share 51 ''; 52 53 meta = with lib; { 54 description = "A tactical 2D shooter played by up to 4 players online or on a shared screen"; 55 homepage = "https://fishfight.org/"; 56 license = with licenses; [ mit /* or */ asl20 ]; 57 maintainers = with maintainers; [ figsoda ]; 58 };
··· 2 , rustPlatform 3 , fetchFromGitHub 4 , stdenv 5 + , makeWrapper 6 , pkg-config 7 , alsa-lib 8 + , libxkbcommon 9 + , udev 10 + , vulkan-loader 11 + , wayland 12 , xorg 13 + , darwin 14 }: 15 16 rustPlatform.buildRustPackage rec { 17 pname = "jumpy"; 18 + version = "0.5.1"; 19 20 src = fetchFromGitHub { 21 + owner = "fishfolk"; 22 repo = pname; 23 rev = "v${version}"; 24 + sha256 = "sha256-5hgd4t9ZKHmv8wzED7Tn+ykzUM0EbQqRX15HBHzXtJY="; 25 }; 26 27 + cargoSha256 = "sha256-cK5n75T+Kkd6F4q4MFZNn0R6W6Nk2/H23AGhIe2FCig="; 28 29 + nativeBuildInputs = [ 30 + makeWrapper 31 + ] ++ lib.optionals stdenv.isLinux [ 32 pkg-config 33 ]; 34 35 buildInputs = lib.optionals stdenv.isLinux [ 36 alsa-lib 37 + libxkbcommon 38 + udev 39 + vulkan-loader 40 + wayland 41 xorg.libX11 42 + xorg.libXcursor 43 xorg.libXi 44 + xorg.libXi 45 + xorg.libXrandr 46 ] ++ lib.optionals stdenv.isDarwin [ 47 + darwin.apple_sdk.frameworks.Cocoa 48 + rustPlatform.bindgenHook 49 ]; 50 51 postPatch = '' 52 + touch ../$(stripHash $cargoDeps)/taffy/README.md 53 ''; 54 55 postInstall = '' 56 mkdir $out/share 57 + cp -r assets $out/share 58 + wrapProgram $out/bin/jumpy \ 59 + --set-default JUMPY_ASSET_DIR $out/share/assets 60 + ''; 61 + 62 + postFixup = lib.optionalString stdenv.isLinux '' 63 + patchelf $out/bin/.jumpy-wrapped \ 64 + --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} 65 ''; 66 67 meta = with lib; { 68 description = "A tactical 2D shooter played by up to 4 players online or on a shared screen"; 69 homepage = "https://fishfight.org/"; 70 + changelog = "https://github.com/fishfolk/jumpy/releases/tag/v${version}"; 71 license = with licenses; [ mit /* or */ asl20 ]; 72 maintainers = with maintainers; [ figsoda ]; 73 };
+1 -3
pkgs/top-level/all-packages.nix
··· 34282 34283 fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; 34284 34285 - jumpy = callPackage ../games/jumpy { 34286 - inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; 34287 - }; 34288 34289 flightgear = libsForQt5.callPackage ../games/flightgear { }; 34290
··· 34282 34283 fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; 34284 34285 + jumpy = callPackage ../games/jumpy { }; 34286 34287 flightgear = libsForQt5.callPackage ../games/flightgear { }; 34288