commit aa172ed022015fb787ca3855bde0ff5f41c1ccbc · pyrox.dev/nixpkgs

+85

pkgs/by-name/to/toppler/gcc14.patch

···

       1
       1
       +
       diff --git a/Makefile b/Makefile

     

       2
       2
       +
       index a6a140f..fb9a8b9 100644

     

       3
       3
       +
       --- a/Makefile

     

       4
       4
       +
       +++ b/Makefile

     

       5
       5
       +
       @@ -518,7 +518,7 @@ src/po/%.po: _build/toppler.pot

     

       6
       6
       +
        # TODO dist and windist..

     

       7
       7
       +
        

     

       8
       8
       +
        .PHONY: install

     

       9
       9
       +
       -install: toppler.dat toppler $(TRANSLATIONFILES_INST)

     

       10
       10
       +
       +install: toppler $(TRANSLATIONFILES_INST)

     

       11
       11
       +
        	$(INSTALL) -m755 -d $(DESTDIR)$(PKGDATADIR)

     

       12
       12
       +
        	$(INSTALL) -m755 -d $(DESTDIR)$(BINDIR)

     

       13
       13
       +
        	$(INSTALL) -m755 -d $(DESTDIR)$(MANDIR)/man6

     

       14
       14
       +
       diff --git a/src/decl.cc b/src/decl.cc

     

       15
       15
       +
       index f80f83e..8a7bbd9 100644

     

       16
       16
       +
       --- a/src/decl.cc

     

       17
       17
       +
       +++ b/src/decl.cc

     

       18
       18
       +
       @@ -22,6 +22,7 @@

     

       19
       19
       +
        #include <SDL.h>

     

       20
       20
       +
        

     

       21
       21
       +
        #include <cstdlib>

     

       22
       22
       +
       +#include <algorithm>

     

       23
       23
       +
        #include <cstring>

     

       24
       24
       +
        #include <sys/stat.h>

     

       25
       25
       +
        #include <unistd.h>

     

       26
       26
       +
       diff --git a/src/keyb.cc b/src/keyb.cc

     

       27
       27
       +
       index c3c13df..7d37847 100644

     

       28
       28
       +
       --- a/src/keyb.cc

     

       29
       29
       +
       +++ b/src/keyb.cc

     

       30
       30
       +
       @@ -156,7 +156,7 @@ static void handleEvents(void) {

     

       31
       31
       +
              mouse_button = e.button.button;

     

       32
       32
       +
              break;

     

       33
       33
       +
            case SDL_QUIT:

     

       34
       34
       +
       -      fprintf(stderr, _("Wheee!!\n").c_str());

     

       35
       35
       +
       +      fprintf(stderr, "%s", _("Wheee!!\n").c_str());

     

       36
       36
       +
              exit(0);

     

       37
       37
       +
              break;

     

       38
       38
       +
        

     

       39
       39
       +
       diff --git a/src/level.cc b/src/level.cc

     

       40
       40
       +
       index e1e2bb8..ac2faf3 100644

     

       41
       41
       +
       --- a/src/level.cc

     

       42
       42
       +
       +++ b/src/level.cc

     

       43
       43
       +
       @@ -27,6 +27,7 @@

     

       44
       44
       +
        #endif

     

       45
       45
       +
        

     

       46
       46
       +
        #include "decl.h"

     

       47
       47
       +
       +#include <algorithm>

     

       48
       48
       +
        

     

       49
       49
       +
        #ifdef _WIN32

     

       50
       50
       +
        #include <direct.h>

     

       51
       51
       +
       diff --git a/src/main.cc b/src/main.cc

     

       52
       52
       +
       index 522d041..ffc8e40 100644

     

       53
       53
       +
       --- a/src/main.cc

     

       54
       54
       +
       +++ b/src/main.cc

     

       55
       55
       +
       @@ -46,7 +46,7 @@ static bool parse_arguments(int argc, char *argv[]) {

     

       56
       56
       +
              if (parm >= '0' && parm <= '9') {

     

       57
       57
       +
                printf(_("Debug level is now %c.\n").c_str(), parm);

     

       58
       58
       +
                config.debug_level(parm - '0');

     

       59
       59
       +
       -      } else printf(_("Illegal debug level value, using default.\n").c_str());

     

       60
       60
       +
       +      } else printf("%s", _("Illegal debug level value, using default.\n").c_str());

     

       61
       61
       +
            } else {

     

       62
       62
       +
              printhelp();

     

       63
       63
       +
              return false;

     

       64
       64
       +
       @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) {

     

       65
       65
       +
            atexit(QuitFunction);

     

       66
       66
       +
            srand(time(0));

     

       67
       67
       +
            startgame();

     

       68
       68
       +
       -    printf(_("Thanks for playing!\n").c_str());

     

       69
       69
       +
       +    printf("%s", _("Thanks for playing!\n").c_str());

     

       70
       70
       +
            SDL_ShowCursor(mouse);

     

       71
       71
       +
            SDL_Quit();

     

       72
       72
       +
          }

     

       73
       73
       +
       diff --git a/src/screen.cc b/src/screen.cc

     

       74
       74
       +
       index eb18543..ce23571 100644

     

       75
       75
       +
       --- a/src/screen.cc

     

       76
       76
       +
       +++ b/src/screen.cc

     

       77
       77
       +
       @@ -30,6 +30,8 @@

     

       78
       78
       +
        #include "keyb.h"

     

       79
       79
       +
        #include "configuration.h"

     

       80
       80
       +
        

     

       81
       81
       +
       +#include <algorithm>

     

       82
       82
       +
       +

     

       83
       83
       +
        static SDL_Surface *display = nullptr;

     

       84
       84
       +
        static SDL_Window *sdlWindow = nullptr;

     

       85
       85
       +
        static SDL_Renderer *sdlRenderer = nullptr;

+91

pkgs/by-name/to/toppler/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchFromGitLab,

     

       5
       5
       +
         nix-update-script,

     

       6
       6
       +
         writableTmpDirAsHomeHook,

     

       7
       7
       +
       

     

       8
       8
       +
         buildPackages,

     

       9
       9
       +
         pkg-config,

     

       10
       10
       +
         gettext,

     

       11
       11
       +
         povray,

     

       12
       12
       +
         imagemagick,

     

       13
       13
       +
         gimp,

     

       14
       14
       +
       

     

       15
       15
       +
         sdl2-compat,

     

       16
       16
       +
         SDL2_mixer,

     

       17
       17
       +
         SDL2_image,

     

       18
       18
       +
         libpng,

     

       19
       19
       +
         zlib,

     

       20
       20
       +
       }:

     

       21
       21
       +
       

     

       22
       22
       +
       stdenv.mkDerivation (finalAttrs: {

     

       23
       23
       +
         pname = "toppler";

     

       24
       24
       +
         version = "1.3";

     

       25
       25
       +
       

     

       26
       26
       +
         src = fetchFromGitLab {

     

       27
       27
       +
           owner = "roever";

     

       28
       28
       +
           repo = "toppler";

     

       29
       29
       +
           rev = "v${finalAttrs.version}";

     

       30
       30
       +
           hash = "sha256-ecEaELu52Nmov/BD9VzcUw6wyWeHJcsKQkEzTnaW330=";

     

       31
       31
       +
         };

     

       32
       32
       +
       

     

       33
       33
       +
         strictDeps = true;

     

       34
       34
       +
         enableParallelBuilding = true;

     

       35
       35
       +
       

     

       36
       36
       +
         depsBuildBuild = [

     

       37
       37
       +
           buildPackages.stdenv.cc

     

       38
       38
       +
           pkg-config

     

       39
       39
       +
           sdl2-compat

     

       40
       40
       +
           SDL2_image

     

       41
       41
       +
           libpng

     

       42
       42
       +
           zlib

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       45
       45
       +
         nativeBuildInputs = [

     

       46
       46
       +
           pkg-config

     

       47
       47
       +
           gettext

     

       48
       48
       +
           povray

     

       49
       49
       +
           imagemagick

     

       50
       50
       +
           gimp

     

       51
       51
       +
           # GIMP needs a writable home

     

       52
       52
       +
           writableTmpDirAsHomeHook

     

       53
       53
       +
         ];

     

       54
       54
       +
       

     

       55
       55
       +
         buildInputs = [

     

       56
       56
       +
           sdl2-compat

     

       57
       57
       +
           SDL2_mixer

     

       58
       58
       +
           zlib

     

       59
       59
       +
         ];

     

       60
       60
       +
       

     

       61
       61
       +
         patches = [

     

       62
       62
       +
           # Based on https://gitlab.com/roever/toppler/-/merge_requests/3

     

       63
       63
       +
           ./gcc14.patch

     

       64
       64
       +
         ];

     

       65
       65
       +
       

     

       66
       66
       +
         makeFlags = [

     

       67
       67
       +
           "CXX_NATIVE=$(CXX_FOR_BUILD)"

     

       68
       68
       +
           "PKG_CONFIG_NATIVE=$(PKG_CONFIG_FOR_BUILD)"

     

       69
       69
       +
           "PREFIX=${placeholder "out"}"

     

       70
       70
       +
         ];

     

       71
       71
       +
       

     

       72
       72
       +
         preBuild = ''

     

       73
       73
       +
           # The `$` is escaped in `makeFlags` so using it for these parameters results in infinite recursion

     

       74
       74
       +
           makeFlagsArray+=(CXX=$CXX PKG_CONFIG=$PKG_CONFIG);

     

       75
       75
       +
         '';

     

       76
       76
       +
       

     

       77
       77
       +
         passthru.updateScript = nix-update-script { };

     

       78
       78
       +
       

     

       79
       79
       +
         meta = {

     

       80
       80
       +
           description = "Jump and run game, reimplementation of Tower Toppler/Nebulus";

     

       81
       81
       +
           homepage = "https://gitlab.com/roever/toppler";

     

       82
       82
       +
           license = with lib.licenses; [

     

       83
       83
       +
             gpl2Plus

     

       84
       84
       +
             # Makefile

     

       85
       85
       +
             gpl3Plus

     

       86
       86
       +
           ];

     

       87
       87
       +
           maintainers = with lib.maintainers; [ fgaz ];

     

       88
       88
       +
           platforms = lib.platforms.all;

     

       89
       89
       +
           mainProgram = "toppler";

     

       90
       90
       +
         };

     

       91
       91
       +
       })

-62

pkgs/games/toppler/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchFromGitLab,

     

       5
       5
       -
       

     

       6
       6
       -
         pkg-config,

     

       7
       7
       -
         gettext,

     

       8
       8
       -
         povray,

     

       9
       9
       -
         imagemagick,

     

       10
       10
       -
         gimp,

     

       11
       11
       -
       

     

       12
       12
       -
         SDL2,

     

       13
       13
       -
         SDL2_mixer,

     

       14
       14
       -
         SDL2_image,

     

       15
       15
       -
         libpng,

     

       16
       16
       -
         zlib,

     

       17
       17
       -
       }:

     

       18
       18
       -
       

     

       19
       19
       -
       stdenv.mkDerivation (finalAttrs: {

     

       20
       20
       -
         pname = "toppler";

     

       21
       21
       -
         version = "1.3";

     

       22
       22
       -
       

     

       23
       23
       -
         src = fetchFromGitLab {

     

       24
       24
       -
           owner = "roever";

     

       25
       25
       -
           repo = "toppler";

     

       26
       26
       -
           rev = "v${finalAttrs.version}";

     

       27
       27
       -
           hash = "sha256-ecEaELu52Nmov/BD9VzcUw6wyWeHJcsKQkEzTnaW330=";

     

       28
       28
       -
         };

     

       29
       29
       -
       

     

       30
       30
       -
         nativeBuildInputs = [

     

       31
       31
       -
           pkg-config

     

       32
       32
       -
           gettext

     

       33
       33
       -
           povray

     

       34
       34
       -
           imagemagick

     

       35
       35
       -
           gimp

     

       36
       36
       -
         ];

     

       37
       37
       -
       

     

       38
       38
       -
         buildInputs = [

     

       39
       39
       -
           SDL2

     

       40
       40
       -
           SDL2_mixer

     

       41
       41
       -
           SDL2_image

     

       42
       42
       -
           libpng

     

       43
       43
       -
           zlib

     

       44
       44
       -
         ];

     

       45
       45
       -
       

     

       46
       46
       -
         # GIMP needs a writable home

     

       47
       47
       -
         preBuild = ''

     

       48
       48
       -
           export HOME=$(mktemp -d)

     

       49
       49
       -
         '';

     

       50
       50
       -
       

     

       51
       51
       -
         makeFlags = [ "PREFIX=$(out)" ];

     

       52
       52
       -
       

     

       53
       53
       -
         hardeningDisable = [ "format" ];

     

       54
       54
       -
       

     

       55
       55
       -
         meta = with lib; {

     

       56
       56
       -
           description = "Jump and run game, reimplementation of Tower Toppler/Nebulus";

     

       57
       57
       -
           homepage = "https://gitlab.com/roever/toppler";

     

       58
       58
       -
           license = licenses.gpl2Plus;

     

       59
       59
       -
           maintainers = with maintainers; [ fgaz ];

     

       60
       60
       -
           platforms = platforms.all;

     

       61
       61
       -
         };

     

       62
       62
       -
       })

-4

pkgs/top-level/all-packages.nix

···

       16506
       16506
        
       

     

       16507
       16507
        
         tibia = pkgsi686Linux.callPackage ../games/tibia { };

     

       16508
       16508
        
       

     

       16509
       16509
       -
         toppler = callPackage ../games/toppler {

     

       16510
       16510
       -
           SDL2_image = SDL2_image_2_0;

     

       16511
       16511
       -
         };

     

       16512
       16512
       -
       

     

       16513
       16509
        
         speed_dreams = callPackage ../games/speed-dreams {

     

       16514
       16510
        
           # Torcs wants to make shared libraries linked with plib libraries (it provides static).

     

       16515
       16511
        
           # i686 is the only platform I know than can do that linking without plib built with -fPIC