diff options
| -rw-r--r-- | pkgs/games/jumpy/default.nix | 49 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 33 insertions, 20 deletions
diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix index 645069e4354d3..332db4a7a0fea 100644 --- a/pkgs/games/jumpy/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -2,57 +2,72 @@ , rustPlatform , fetchFromGitHub , stdenv +, makeWrapper , pkg-config , alsa-lib -, libGL -, xorg +, libxkbcommon , udev -, Cocoa -, OpenGL +, vulkan-loader +, wayland +, xorg +, darwin }: rustPlatform.buildRustPackage rec { pname = "jumpy"; - version = "0.4.3"; + version = "0.5.1"; src = fetchFromGitHub { - owner = "fishfolks"; + owner = "fishfolk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-01zhiQi6v/8ZajsdBU+4hKUCj+PRJ/vUHluOIzy/Gi8="; + sha256 = "sha256-5hgd4t9ZKHmv8wzED7Tn+ykzUM0EbQqRX15HBHzXtJY="; }; - cargoSha256 = "sha256-AXaGuRqSFiq+Uiy+UaqPdPVyDhCogC64KZZ0Ah1Yo7A="; + cargoSha256 = "sha256-cK5n75T+Kkd6F4q4MFZNn0R6W6Nk2/H23AGhIe2FCig="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = [ + makeWrapper + ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ alsa-lib - libGL + libxkbcommon + udev + vulkan-loader + wayland xorg.libX11 + xorg.libXcursor xorg.libXi - udev + xorg.libXi + xorg.libXrandr ] ++ lib.optionals stdenv.isDarwin [ - Cocoa - OpenGL + darwin.apple_sdk.frameworks.Cocoa + rustPlatform.bindgenHook ]; postPatch = '' - substituteInPlace src/main.rs \ - --replace ./assets $out/share/assets \ - --replace ./mods $out/share/mods + touch ../$(stripHash $cargoDeps)/taffy/README.md ''; postInstall = '' mkdir $out/share - cp -r assets mods $out/share + cp -r assets $out/share + wrapProgram $out/bin/jumpy \ + --set-default JUMPY_ASSET_DIR $out/share/assets + ''; + + postFixup = lib.optionalString stdenv.isLinux '' + patchelf $out/bin/.jumpy-wrapped \ + --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; meta = with lib; { description = "A tactical 2D shooter played by up to 4 players online or on a shared screen"; homepage = "https://fishfight.org/"; + changelog = "https://github.com/fishfolk/jumpy/releases/tag/v${version}"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cbf5a28d14ea..86e5f6f2e1ab2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34282,9 +34282,7 @@ with pkgs; fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; - jumpy = callPackage ../games/jumpy { - inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; - }; + jumpy = callPackage ../games/jumpy { }; flightgear = libsForQt5.callPackage ../games/flightgear { }; |