Skip to content

Commit 644c180

Browse files
authored
wipeout-rewrite: nixfmt, modernise, bump (#354647)
2 parents 778f30c + 58b8cb6 commit 644c180

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

pkgs/games/wipeout-rewrite/default.nix renamed to pkgs/by-name/wi/wipeout-rewrite/package.nix

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
{ stdenv
2-
, lib
3-
, fetchFromGitHub
4-
, makeWrapper
5-
, Foundation
6-
, glew
7-
, SDL2
8-
, writeShellScript
1+
{
2+
stdenv,
3+
lib,
4+
fetchFromGitHub,
5+
unstableGitUpdater,
6+
makeWrapper,
7+
glew,
8+
SDL2,
9+
writeShellScript,
910
}:
1011

1112
let
@@ -24,13 +25,13 @@ let
2425
in
2526
stdenv.mkDerivation (finalAttrs: {
2627
pname = "wipeout-rewrite";
27-
version = "unstable-2023-08-13";
28+
version = "0-unstable-2024-07-07";
2829

2930
src = fetchFromGitHub {
3031
owner = "phoboslab";
3132
repo = "wipeout-rewrite";
32-
rev = "7a9f757a79d5c6806252cc1268bda5cdef463e23";
33-
hash = "sha256-21IG9mZPGgRhVkT087G+Bz/zLkknkHKGmWjSpcLw8vE=";
33+
rev = "a372b51f59217da4a5208352123a4acca800783c";
34+
hash = "sha256-RJrWOTb5cZ2rSgO/J8qW5ifMJryBaK6MDtYwQZfghS0=";
3435
};
3536

3637
enableParallelBuilding = true;
@@ -42,10 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
4243
buildInputs = [
4344
glew
4445
SDL2
45-
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
46-
Foundation
4746
];
4847

48+
# Force this to empty, so assets are looked up in CWD instead of $out/bin
49+
env.NIX_CFLAGS_COMPILE = "-DPATH_ASSETS=";
50+
4951
installPhase = ''
5052
runHook preInstall
5153
@@ -60,12 +62,14 @@ stdenv.mkDerivation (finalAttrs: {
6062
runHook postInstall
6163
'';
6264

63-
meta = with lib; {
65+
passthru.updateScript = unstableGitUpdater { };
66+
67+
meta = {
6468
mainProgram = "wipegame";
6569
description = "Re-implementation of the 1995 PSX game wipEout";
6670
homepage = "https://github.com/phoboslab/wipeout-rewrite";
67-
license = licenses.unfree;
68-
maintainers = with maintainers; [ OPNA2608 ];
69-
platforms = platforms.all;
71+
license = lib.licenses.unfree;
72+
maintainers = with lib.maintainers; [ OPNA2608 ];
73+
platforms = lib.platforms.all;
7074
};
7175
})

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16820,10 +16820,6 @@ with pkgs;
1682016820

1682116821
pmars-x11 = pmars.override { enableXwinGraphics = true; };
1682216822

16823-
wipeout-rewrite = callPackage ../games/wipeout-rewrite {
16824-
inherit (darwin.apple_sdk.frameworks) Foundation;
16825-
};
16826-
1682716823
### GAMES/DOOM-PORTS
1682816824

1682916825
doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { };

0 commit comments

Comments
 (0)