srb2: init at 2.2.8 #105087

zeratax · 2020-11-26T22:12:03Z

Motivation for this change

added Sonic Robo Blast 2 to my best abilties with what I saw from their CI and wiki:
https://github.com/STJr/SRB2/blob/master/.travis.yml
http://wiki.srb2.org/wiki/Source_code_compiling/CMake

Things done

pkgs/games/srb2/default.nix

zeratax · 2020-12-09T14:31:44Z

I created a nur package if anyone wants to try this https://github.com/ZerataX/nur-packages/blob/master/pkgs/srb2/default.nix

rmcgibbo

$ srb2 
Compiled for SDL version: 2.0.14
Linked with SDL version: 2.0.14
Setting up SRB2...


Sonic Robo Blast 2
Copyright (C) 1998-2020 by Sonic Team Junior

This program comes with ABSOLUTELY NO WARRANTY.

This is free software, and you are welcome to redistribute it
and/or modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version.
See the 'LICENSE.txt' file for details.

Sonic the Hedgehog and related characters are trademarks of SEGA.
We do not claim ownership of SEGA's intellectual property used
in this program.

M_StartupLocale...
Looking for WADs in: SRB2WADDIR,.,/usr/local/share/games/SRB2,/usr/local/games/SRB2,/usr/share/games/SRB2,/usr/games/SRB2,HOME, in:/usr/local/games, in:/usr/games, in:/usr/local

I_Error(): srb2.pk3 not found! Expected in /home/mcgibbon/.cache/nixpkgs-review/pr-105087, ss file: /home/mcgibbon/.cache/nixpkgs-review/pr-105087/srb2.pk3

I_ShutdownGraphics(): graphics never started
I_ShutdownSystem(): end of logstream.
Shutdown tty console

Doesn't seem to boot on my machine (x86_64-linux)

zeratax · 2021-04-05T21:10:16Z

@rmcgibbo hmm I can't replicate that at all?

I_Error(): srb2.pk3 not found! Expected in /home/mcgibbon/.cache/nixpkgs-review/pr-105087, ss file: /home/mcgibbon/.cache/nixpkgs-review/pr-105087/srb2.pk3

seems weird to me especially since this file just gets downloaded and then unzipped with 7zip? not sure what could go wrong there?

pkgs/games/srb2/default.nix

SuperSandro2000 · 2021-04-05T22:27:25Z

@rmcgibbo hmm I can't replicate that at all?
I_Error(): srb2.pk3 not found! Expected in /home/mcgibbon/.cache/nixpkgs-review/pr-105087, ss file: /home/mcgibbon/.cache/nixpkgs-review/pr-105087/srb2.pk3
seems weird to me especially since this file just gets downloaded and then unzipped with 7zip? not sure what could go wrong there?

It looks for the file at the wrong directories, to be exact not in the nix store. This needs to be patched.

zeratax · 2021-04-07T20:08:39Z

@SuperSandro2000
So I think I basically now understand how these files are found, mainly here
https://github.com/STJr/SRB2/blob/master/src/sdl/i_system.c#L2805
and the locations are defined here:
https://github.com/STJr/SRB2/blob/master/src/sdl/i_system.c#L148-L154

So I would remove the check for the cwd and remove every but 1 definition for the nix store?

I am just not sure how to most elegantly patch this? with a normal patch file i don't know where the location in the nix store will be?

SuperSandro2000 · 2021-04-09T00:38:02Z

So I would remove the check for the cwd and remove every but 1 definition for the nix store?

where the srb2.pk3 file is located.

I am just not sure how to most elegantly patch this? with a normal patch file i don't know where the location in the nix store will be?

Take a look how it is done in this package with substituteAll and @MPV@

nixpkgs/pkgs/applications/audio/curseradio/default.nix

Line 21 in 7248f89

(substituteAll {

zeratax · 2021-04-09T19:44:46Z

my current solution isn't exactly elegant, but I don't know how else to access $out with substituteAll
https://github.com/NixOS/nixpkgs/blob/f7751733d651a0eb1e705a1e14ce2e6b8adf2369/pkgs/games/srb2/default.nix#L71
I think using patchPhase makes it difficult to properly override patches? but using prePatchPhase or postPatchPhase wouldn't work for me.

Open to suggestions @SuperSandro2000

SuperSandro2000 · 2021-04-12T00:13:18Z

postPatchPhase wouldn't work for me.

The name of the phase is postPatch or prePatch.

zeratax · 2021-04-23T18:29:40Z

@SuperSandro2000 right sorry I did that but it doesn't work

SuperSandro2000 · 2021-04-24T01:17:22Z

As long as you are overwriting patchPhase it does not.

zeratax · 2021-04-24T02:41:51Z

does not what? postPatch nor prePatch won't build for me, only patchPhase allows me to set this.
My current version builds and works?

zeratax · 2021-04-30T21:10:19Z

@SuperSandro2000 Instead of changing the patch file i just changed the src file after it's patched.

nixpkgs/pkgs/games/srb2/default.nix

Lines 67 to 74 in 9254c68

    
             patches = [ 
        
               ./wadlocation.patch 
        
             ]; 
        
             postPatch = '' 
        
               substituteInPlace src/sdl/i_system.c \ 
        
                   --replace '@wadlocation@' $out 
        
             '';

stale · 2021-10-30T17:09:17Z

I marked this as stale due to inactivity. → More info

zeratax · 2021-10-30T18:26:09Z

still waiting for someone to review this.

SuperSandro2000 · 2021-10-31T20:57:29Z

pkgs/games/srb2/default.nix

+  ];
+
+  cmakeFlags = [
+    "-DSRB2_ASSET_DIRECTORY=/build/source/assets"


We can't hardcode /build/.

Suggested change

"-DSRB2_ASSET_DIRECTORY=/build/source/assets"

"-DSRB2_ASSET_DIRECTORY=${src}/assets"

auroraanna · 2022-04-03T00:13:18Z

pkgs/games/srb2/default.nix

+
+in stdenv.mkDerivation rec {
+  pname = "srb2";
+  version = "2.2.8";


Suggested change

version = "2.2.8";

version = "2.2.10";

Update the sha too.

auroraanna · 2022-04-03T00:15:00Z

pkgs/games/srb2/default.nix

+  ];
+
+  cmakeFlags = [
+    "-DSRB2_ASSET_DIRECTORY=/build/source/assets"


Suggested change

"-DSRB2_ASSET_DIRECTORY=/build/source/assets"

"-DSRB2_ASSET_DIRECTORY=${src}/assets"

auroraanna · 2022-04-03T00:15:30Z

pkgs/games/srb2/default.nix

+    7z x ${assets} -o"/build/source/assets" -aos
+    7z x ${assets_optional} -o"/build/source/assets" -aos


Suggested change

7z x ${assets} -o"/build/source/assets" -aos

7z x ${assets_optional} -o"/build/source/assets" -aos

7z x ${assets} -o"${src}/assets" -aos

7z x ${assets_optional} -o" ${src}/assets" -aos

auroraanna · 2022-04-03T00:30:27Z

pkgs/games/srb2/default.nix

+  ];
+
+  postPatch = ''
+    substituteInPlace src/sdl/i_system.c \


Suggested change

substituteInPlace src/sdl/i_system.c \

substituteInPlace ${src}/sdl/i_system.c \

fgaz · 2022-06-06T14:12:53Z

Merged in in #172761

zeratax force-pushed the SRB2 branch 2 times, most recently from 7b6e12c to df36e3f Compare November 26, 2020 22:24

ofborg bot added 8.has: package (new) 11.by: package-maintainer 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Nov 26, 2020

SuperSandro2000 reviewed Nov 26, 2020

View reviewed changes

pkgs/games/srb2/default.nix Outdated Show resolved Hide resolved

pkgs/games/srb2/default.nix Outdated Show resolved Hide resolved

pkgs/games/srb2/default.nix Outdated Show resolved Hide resolved

zeratax force-pushed the SRB2 branch from df36e3f to 17b51f7 Compare November 26, 2020 22:27

SuperSandro2000 requested changes Nov 26, 2020

View reviewed changes

pkgs/games/srb2/default.nix Show resolved Hide resolved

zeratax force-pushed the SRB2 branch from 17b51f7 to 1460d53 Compare November 26, 2020 23:36

zeratax changed the title ~~srb2: init at 2.28~~ srb2: init at 2.2.8 Nov 26, 2020

aanderse requested a review from SuperSandro2000 December 9, 2020 14:33

rmcgibbo suggested changes Mar 16, 2021

View reviewed changes

SuperSandro2000 requested changes Apr 5, 2021

View reviewed changes

zeratax force-pushed the SRB2 branch 2 times, most recently from 6e1e45d to fb5cc8c Compare April 9, 2021 19:42

zeratax force-pushed the SRB2 branch from fb5cc8c to f775173 Compare April 9, 2021 19:52

srb2: init at 2.2.8

9254c68

zeratax force-pushed the SRB2 branch from f775173 to 9254c68 Compare April 30, 2021 16:15

stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 30, 2021

stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 30, 2021

SuperSandro2000 reviewed Oct 31, 2021

View reviewed changes

auroraanna suggested changes Apr 3, 2022

View reviewed changes

viric mentioned this pull request May 12, 2022

Srb2 master #172761

Merged

13 tasks

fgaz closed this Jun 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

srb2: init at 2.2.8 #105087

srb2: init at 2.2.8 #105087

zeratax commented Nov 26, 2020

zeratax commented Dec 9, 2020

rmcgibbo left a comment

zeratax commented Apr 5, 2021 •

edited

SuperSandro2000 commented Apr 5, 2021

zeratax commented Apr 7, 2021

SuperSandro2000 commented Apr 9, 2021

zeratax commented Apr 9, 2021 •

edited

SuperSandro2000 commented Apr 12, 2021 •

edited

zeratax commented Apr 23, 2021

SuperSandro2000 commented Apr 24, 2021

zeratax commented Apr 24, 2021 •

edited

zeratax commented Apr 30, 2021

stale bot commented Oct 30, 2021

zeratax commented Oct 30, 2021

SuperSandro2000 Oct 31, 2021

auroraanna Apr 3, 2022

auroraanna Apr 3, 2022

auroraanna Apr 3, 2022

auroraanna Apr 3, 2022

auroraanna Apr 3, 2022

auroraanna Apr 3, 2022

fgaz commented Jun 6, 2022

	"-DSRB2_ASSET_DIRECTORY=/build/source/assets"
	"-DSRB2_ASSET_DIRECTORY=${src}/assets"

		7z x ${assets} -o"/build/source/assets" -aos
		7z x ${assets_optional} -o"/build/source/assets" -aos

	substituteInPlace src/sdl/i_system.c \
	substituteInPlace ${src}/sdl/i_system.c \

srb2: init at 2.2.8 #105087

srb2: init at 2.2.8 #105087

Conversation

zeratax commented Nov 26, 2020

Motivation for this change

Things done

zeratax commented Dec 9, 2020

rmcgibbo left a comment

Choose a reason for hiding this comment

zeratax commented Apr 5, 2021 • edited

SuperSandro2000 commented Apr 5, 2021

zeratax commented Apr 7, 2021

SuperSandro2000 commented Apr 9, 2021

zeratax commented Apr 9, 2021 • edited

SuperSandro2000 commented Apr 12, 2021 • edited

zeratax commented Apr 23, 2021

SuperSandro2000 commented Apr 24, 2021

zeratax commented Apr 24, 2021 • edited

zeratax commented Apr 30, 2021

stale bot commented Oct 30, 2021

zeratax commented Oct 30, 2021

SuperSandro2000 Oct 31, 2021

Choose a reason for hiding this comment

auroraanna Apr 3, 2022

Choose a reason for hiding this comment

auroraanna Apr 3, 2022

Choose a reason for hiding this comment

auroraanna Apr 3, 2022

Choose a reason for hiding this comment

auroraanna Apr 3, 2022

Choose a reason for hiding this comment

auroraanna Apr 3, 2022

Choose a reason for hiding this comment

auroraanna Apr 3, 2022

Choose a reason for hiding this comment

fgaz commented Jun 6, 2022

zeratax commented Apr 5, 2021 •

edited

zeratax commented Apr 9, 2021 •

edited

SuperSandro2000 commented Apr 12, 2021 •

edited

zeratax commented Apr 24, 2021 •

edited