Merge pull request #195899 from wegank/scorched3d-wxgtk
This commit is contained in:
commit
3821db7ad7
@ -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 }:
|
, freetype, libvorbis, fftwSinglePrec, SDL, SDL_net, expat, libjpeg, libpng }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
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
|
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";
|
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch?id=1bbcfc9ae3dfdfcbdd35151cb7b6050776215e4d";
|
||||||
sha256 = "1farmjxbc2wm4scsdbdnvh29fipnb6mp6z85hxz4bx6n9kbc8y7n";
|
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";
|
sourceRoot = "scorched";
|
||||||
|
Loading…
Reference in New Issue
Block a user