diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-20 06:05:55 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-20 06:05:55 +0000 |
commit | 6e9b36d7a046336cbde184b9b1c1a6939d054aee (patch) | |
tree | 383f6dba312c70701c8a09d110f0ad1e096a30cb /pkgs/games | |
parent | 0eb4236f51ce7e2c111e54b42898142be3210648 (diff) | |
parent | 260eb420a2e55e3a0411e731b933c3a8bf6b778e (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/asc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/fsg/default.nix | 10 | ||||
-rw-r--r-- | pkgs/games/fsg/wxgtk-3.2.patch | 68 | ||||
-rw-r--r-- | pkgs/games/megaglest/default.nix | 8 | ||||
-rw-r--r-- | pkgs/games/wesnoth/default.nix | 4 |
5 files changed, 82 insertions, 12 deletions
diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index 46f8231680bd2..f351040ff883d 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs -, boost, expat, freetype, libjpeg, wxGTK, lua, perl, pkg-config, zlib, zip, bzip2 +, boost, expat, freetype, libjpeg, wxGTK32, lua, perl, pkg-config, zlib, zip, bzip2 , libpng, libtiff, fluidsynth, libmikmod, libvorbis, flac, libogg }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat - freetype libjpeg wxGTK lua perl zlib zip bzip2 libpng + freetype libjpeg wxGTK32 lua perl zlib zip bzip2 libpng libtiff fluidsynth libmikmod flac libvorbis libogg ]; diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 3869ad9884947..282030023f74f 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, glib, pkg-config, libGLU, libGL, wxGTK, libX11, xorgproto -, runtimeShell }: +{ lib, stdenv, fetchurl, gtk2, glib, pkg-config, libGLU, libGL, wxGTK32, libX11, xorgproto, runtimeShell }: stdenv.mkDerivation rec { pname = "fsg"; @@ -11,10 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c"; }; + patches = [ ./wxgtk-3.2.patch ]; + hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 glib libGLU libGL wxGTK libX11 xorgproto ]; + + buildInputs = [ glib libGLU libGL wxGTK32 libX11 xorgproto ]; preBuild = '' sed -e ' @@ -32,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Cellular automata engine tuned towards the likes of Falling Sand"; - maintainers = [lib.maintainers.raskin]; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/fsg/wxgtk-3.2.patch b/pkgs/games/fsg/wxgtk-3.2.patch new file mode 100644 index 0000000000000..dff9f54aeeebf --- /dev/null +++ b/pkgs/games/fsg/wxgtk-3.2.patch @@ -0,0 +1,68 @@ +diff --git a/Canvas.cpp b/Canvas.cpp +index 8c00727..5ee7756 100644 +--- a/Canvas.cpp ++++ b/Canvas.cpp +@@ -889,7 +889,6 @@ void Canvas::Refresh(){ + if (doDraw){ + wxClientDC dc(this); + +- dc.BeginDrawing(); + + wxMemoryDC memdc; + wxImage image(g_width, g_height, bitmapdata, true); +@@ -899,7 +898,6 @@ void Canvas::Refresh(){ + dc.Blit(0,0,g_width, g_height, &memdc, 0, 0); + + if (!drawAll){ +- dc.EndDrawing(); + return; + } + else{ +@@ -912,7 +910,6 @@ void Canvas::Refresh(){ + } + + +- dc.EndDrawing(); + + } + } +diff --git a/MainFrame.cpp b/MainFrame.cpp +index c45107b..d93f9e1 100644 +--- a/MainFrame.cpp ++++ b/MainFrame.cpp +@@ -178,7 +178,7 @@ MainFrame::MainFrame(const wxString& title, const wxPoint& pos, const wxSize& si + RHSizer->Add(RH4, 0, wxEXPAND | wxALL, 5); + } + +- sizer->Add(g_canvas, 0, wxADJUST_MINSIZE | wxALL, 10); ++ sizer->Add(g_canvas, 0, wxALL, 10); + sizer->Add(RHSizer, 1, wxEXPAND); + } + this->SetSizer(sizer); +@@ -1165,7 +1165,7 @@ void MainFrame::OnMenu(wxCommandEvent& event){ + } + else if(event.GetId() == 1051){ + //Load +- wxFileDialog dialog(this, _("Load from a file"), _(""), _(""), _("Any Image Files (*.*)|*.*"), wxOPEN); ++ wxFileDialog dialog(this, _("Load from a file"), _(""), _(""), _("Any Image Files (*.*)|*.*"), wxFD_OPEN); + + if (dialog.ShowModal() == wxID_OK){ + sandboxFilename = dialog.GetPath(); +@@ -1174,7 +1174,7 @@ void MainFrame::OnMenu(wxCommandEvent& event){ + } + else if(event.GetId() == 1052){ + //Save +- wxFileDialog dialog(this, _("Save to a file"), _(""), _(""), _("PNG files (*.png)|*.png|BMP files (*.bmp)|*.bmp"), wxSAVE); ++ wxFileDialog dialog(this, _("Save to a file"), _(""), _(""), _("PNG files (*.png)|*.png|BMP files (*.bmp)|*.bmp"), wxFD_SAVE); + + if (dialog.ShowModal() == wxID_OK){ + wxString filename = dialog.GetPath(); +@@ -1216,7 +1216,7 @@ void MainFrame::OnMenu(wxCommandEvent& event){ + else if(event.GetId() == 1055){ + //Load physics + +- wxFileDialog dialog(this, _("Load from a file"), _(""), _(""), _("Physics Files (*.txt)|*.txt"), wxOPEN); ++ wxFileDialog dialog(this, _("Load from a file"), _(""), _(""), _("Physics Files (*.txt)|*.txt"), wxFD_OPEN); + if (dialog.ShowModal() == wxID_OK){ + physicsFilename = dialog.GetPath(); + loadPhysics(physicsFilename); diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 52949cf18aaeb..21ee6fa37448a 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc -, libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng +, libjpeg, wxGTK30-gtk3, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib , fetchFromGitHub, fetchpatch }: @@ -9,7 +9,7 @@ let name = "megaglest-lib-env"; paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype - stdenv.cc.cc glew libGLU wxGTK ]; + stdenv.cc.cc glew libGLU wxGTK30-gtk3 ]; }; path-env = buildEnv { name = "megaglest-path-env"; @@ -38,11 +38,11 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake pkg-config makeWrapper git ]; - buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK + buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK30-gtk3 glib cppunit fontconfig freetype ftgl glew libogg libvorbis libGLU ]; cmakeFlags = [ - "-DCMAKE_INSTALL_PREFIX=$out" + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" "-DBUILD_MEGAGLEST=On" "-DBUILD_MEGAGLEST_MAP_EDITOR=On" "-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On" diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index b6ee5ac7d7b20..a98e695950bb5 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.16.5"; + version = "1.16.6"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "sha256-U01dMrbPRBliag/RKnwG1G2YEv7fiTh6+S+S5cO1Fx8="; + sha256 = "sha256-oQRjVjVjLIvCCafLr0FXvLwnKDjJY2FU20dYGLtNFiU="; }; nativeBuildInputs = [ cmake pkg-config ]; |