diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-11-04 01:19:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 01:19:16 +0100 |
| commit | 3821db7ad7fd927b676269339a6a1f1c3203f06f (patch) | |
| tree | bc5869e18b0b51026cab4b0e143f263b2c660a9c /pkgs/games | |
| parent | b4fadf797d70840444299ea99c01c453ded4dcfb (diff) | |
| parent | c548b9e83be104f38efcff5618589a3caf466f87 (diff) | |
Merge pull request #195899 from wegank/scorched3d-wxgtk
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/scorched3d/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 227ab720490a4..fa8b7bcc8dd44 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libGLU, libGL, glew, pkg-config, openalSoft, freealut, wxGTK, libogg +{ lib, stdenv, fetchurl, libGLU, libGL, glew, pkg-config, openalSoft, freealut, wxGTK32, libogg , freetype, libvorbis, fftwSinglePrec, SDL, SDL_net, expat, libjpeg, libpng }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ libGLU libGL glew openalSoft freealut wxGTK libogg freetype libvorbis + [ libGLU libGL glew openalSoft freealut wxGTK32 libogg freetype libvorbis SDL SDL_net expat libjpeg libpng fftwSinglePrec ]; @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch?id=1bbcfc9ae3dfdfcbdd35151cb7b6050776215e4d"; sha256 = "1farmjxbc2wm4scsdbdnvh29fipnb6mp6z85hxz4bx6n9kbc8y7n"; }) + (fetchurl { + url = "https://sources.debian.org/data/main/s/scorched3d/44%2Bdfsg-7/debian/patches/wx3.0-compat.patch"; + sha256 = "sha256-Y5U5yYNT5iMqhdRaDMFtZ4K7aD+pugFZP0jLh7rdDp8="; + }) ]; sourceRoot = "scorched"; |