diff --git a/pkgs/games/wipeout-rewrite/default.nix b/pkgs/by-name/wi/wipeout-rewrite/package.nix similarity index 70% rename from pkgs/games/wipeout-rewrite/default.nix rename to pkgs/by-name/wi/wipeout-rewrite/package.nix index 99e7d9b9d31c..24d51774a7bf 100644 --- a/pkgs/games/wipeout-rewrite/default.nix +++ b/pkgs/by-name/wi/wipeout-rewrite/package.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, makeWrapper -, Foundation -, glew -, SDL2 -, writeShellScript +{ + stdenv, + lib, + fetchFromGitHub, + unstableGitUpdater, + makeWrapper, + glew, + SDL2, + writeShellScript, }: let @@ -24,13 +25,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wipeout-rewrite"; - version = "unstable-2023-08-13"; + version = "0-unstable-2024-07-07"; src = fetchFromGitHub { owner = "phoboslab"; repo = "wipeout-rewrite"; - rev = "7a9f757a79d5c6806252cc1268bda5cdef463e23"; - hash = "sha256-21IG9mZPGgRhVkT087G+Bz/zLkknkHKGmWjSpcLw8vE="; + rev = "a372b51f59217da4a5208352123a4acca800783c"; + hash = "sha256-RJrWOTb5cZ2rSgO/J8qW5ifMJryBaK6MDtYwQZfghS0="; }; enableParallelBuilding = true; @@ -42,10 +43,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glew SDL2 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation ]; + # Force this to empty, so assets are looked up in CWD instead of $out/bin + env.NIX_CFLAGS_COMPILE = "-DPATH_ASSETS="; + installPhase = '' runHook preInstall @@ -60,12 +62,14 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + passthru.updateScript = unstableGitUpdater { }; + + meta = { mainProgram = "wipegame"; description = "Re-implementation of the 1995 PSX game wipEout"; homepage = "https://github.com/phoboslab/wipeout-rewrite"; - license = licenses.unfree; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.all; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b233168231f9..7b6a0bee6a3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16820,10 +16820,6 @@ with pkgs; pmars-x11 = pmars.override { enableXwinGraphics = true; }; - wipeout-rewrite = callPackage ../games/wipeout-rewrite { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; - ### GAMES/DOOM-PORTS doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { };