megaglest: migrate to wxGTK32

+24 -3
+24 -3
pkgs/games/megaglest/default.nix
··· 1 { lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc 2 - , libjpeg, wxGTK30, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng 3 , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib 4 , fetchFromGitHub, fetchpatch 5 }: ··· 9 name = "megaglest-lib-env"; 10 paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext 11 xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype 12 - stdenv.cc.cc glew libGLU wxGTK30 ]; 13 }; 14 path-env = buildEnv { 15 name = "megaglest-path-env"; ··· 35 url = "https://github.com/MegaGlest/megaglest-source/commit/5a3520540276a6fd06f7c88e571b6462978e3eab.patch"; 36 sha256 = "0y554kjw56dikq87vs709pmq97hdx9hvqsk27f81v4g90m3b3qhi"; 37 }) 38 ]; 39 40 nativeBuildInputs = [ cmake pkg-config makeWrapper git ]; 41 - buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK30 42 glib cppunit fontconfig freetype ftgl glew libogg libvorbis libGLU ]; 43 44 cmakeFlags = [
··· 1 { lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc 2 + , libjpeg, wxGTK32, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng 3 , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib 4 , fetchFromGitHub, fetchpatch 5 }: ··· 9 name = "megaglest-lib-env"; 10 paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext 11 xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype 12 + stdenv.cc.cc glew libGLU wxGTK32 ]; 13 }; 14 path-env = buildEnv { 15 name = "megaglest-path-env"; ··· 35 url = "https://github.com/MegaGlest/megaglest-source/commit/5a3520540276a6fd06f7c88e571b6462978e3eab.patch"; 36 sha256 = "0y554kjw56dikq87vs709pmq97hdx9hvqsk27f81v4g90m3b3qhi"; 37 }) 38 + # Pull upstream and Debian fixes for wxWidgets 3.2 39 + (fetchpatch { 40 + name = "get-rid-of-manual-wxPaintEvent-creation-1.patch"; 41 + url = "https://github.com/MegaGlest/megaglest-source/commit/e09ba53c436279588f769d6ce8852e74d58f8391.patch"; 42 + hash = "sha256-1ZG6AjnLXW18wwad05kjH7W5rTaP1SDpZ5zLH4nRQt4="; 43 + }) 44 + (fetchpatch { 45 + name = "get-rid-of-manual-wxPaintEvent-creation-2.patch"; 46 + url = "https://sources.debian.org/data/main/m/megaglest/3.13.0-9/debian/patches/fbd0cfb17ed759d24aeb577a602b0d97f7895cc2.patch"; 47 + hash = "sha256-aMDDboNdH22r7YOiZCEApwz+FpM60anBp82tLwiIH6g="; 48 + }) 49 + (fetchpatch { 50 + name = "get-rid-of-manual-wxPaintEvent-creation-3.patch"; 51 + url = "https://github.com/MegaGlest/megaglest-source/commit/5801b1fafff8ad9618248d4d5d5c751fdf52be2f.patch"; 52 + hash = "sha256-/RpBoT1JsSFtOrAXphHrPp9DnTbaEN/2h8EZmQ9PIPU="; 53 + }) 54 + (fetchpatch { 55 + name = "fix-editor-and-g3dviewer-for-wx-3.1.x.patch"; 56 + url = "https://github.com/MegaGlest/megaglest-source/commit/789e1cdf371137b729e832e28a5feb6e97a3a243.patch"; 57 + hash = "sha256-fK7vkHCu6bqVB6I7vMsWMGiczSdxVgo1KqqBNMkEbfM="; 58 + }) 59 ]; 60 61 nativeBuildInputs = [ cmake pkg-config makeWrapper git ]; 62 + buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK32 63 glib cppunit fontconfig freetype ftgl glew libogg libvorbis libGLU ]; 64 65 cmakeFlags = [