diff options
| author | Artturi <Artturin@artturin.com> | 2022-12-06 23:28:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-06 23:28:43 +0200 |
| commit | 850fb23aa808d0c248e9a9741f800498ac7e5cb6 (patch) | |
| tree | aea8db22be7ab98128dd1c0809a009efba79bca6 /pkgs/games | |
| parent | 1c68ea590db0a7ff7684b2ae036fbb52ca139675 (diff) | |
| parent | 07cd65bea252c7cf7aeaec9d9b63d51bb8308af5 (diff) | |
Merge pull request #204214 from wegank/wxgtk30-gtk2-drop
treewide: drop wxGTK30-gtk2
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/megaglest/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/games/rigsofrods/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 21ee6fa37448a..e8558af0732a5 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, wxGTK30-gtk3, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng +, libjpeg, wxGTK30, 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 wxGTK30-gtk3 ]; + stdenv.cc.cc glew libGLU wxGTK30 ]; }; path-env = buildEnv { name = "megaglest-path-env"; @@ -38,7 +38,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake pkg-config makeWrapper git ]; - buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK30-gtk3 + buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK30 glib cppunit fontconfig freetype ftgl glew libogg libvorbis libGLU ]; cmakeFlags = [ diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 1e1b8130e3779..c3bf4498fa4ba 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, wxGTK30-gtk3, freeimage, cmake, zziplib, libGLU, libGL, boost, +{ fetchFromGitHub, lib, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost, pkg-config, libuuid, openal, ogre, ois, curl, gtk3, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake pkg-config unzip ]; - buildInputs = [ wxGTK30-gtk3 freeimage zziplib libGLU libGL boost + buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost libuuid openal ogre ois curl gtk3 mygui angelscript ogrepaged mysocketw libxcb ]; |