Merge pull request #15422 from rardiol/scorched3d
scorched3d update and SDL1.2 opengl fix
This commit is contained in:
commit
f67b8f8e64
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap
|
{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap
|
||||||
, openglSupport ? false, mesa_noglu ? null
|
, openglSupport ? false, mesa ? null
|
||||||
, alsaSupport ? true, alsaLib ? null
|
, alsaSupport ? true, alsaLib ? null
|
||||||
, x11Support ? true, xlibsWrapper ? null, libXrandr ? null
|
, x11Support ? true, xlibsWrapper ? null, libXrandr ? null
|
||||||
, pulseaudioSupport ? true, libpulseaudio ? null
|
, pulseaudioSupport ? true, libpulseaudio ? null
|
||||||
|
@ -10,7 +10,7 @@
|
||||||
# PulseAudio.
|
# PulseAudio.
|
||||||
assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport;
|
assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport;
|
||||||
|
|
||||||
assert openglSupport -> (mesa_noglu != null && x11Support);
|
assert openglSupport -> (mesa != null && x11Support);
|
||||||
assert x11Support -> (xlibsWrapper != null && libXrandr != null);
|
assert x11Support -> (xlibsWrapper != null && libXrandr != null);
|
||||||
assert alsaSupport -> alsaLib != null;
|
assert alsaSupport -> alsaLib != null;
|
||||||
assert pulseaudioSupport -> libpulseaudio != null;
|
assert pulseaudioSupport -> libpulseaudio != null;
|
||||||
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||||
optionals x11Support [ xlibsWrapper libXrandr ] ++
|
optionals x11Support [ xlibsWrapper libXrandr ] ++
|
||||||
optional alsaSupport alsaLib ++
|
optional alsaSupport alsaLib ++
|
||||||
optional stdenv.isLinux libcap ++
|
optional stdenv.isLinux libcap ++
|
||||||
optional openglSupport mesa_noglu ++
|
optional openglSupport mesa ++
|
||||||
optional pulseaudioSupport libpulseaudio ++
|
optional pulseaudioSupport libpulseaudio ++
|
||||||
optional stdenv.isDarwin Cocoa;
|
optional stdenv.isDarwin Cocoa;
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ mesa glew openalSoft freealut wxGTK libogg freetype libvorbis
|
[ mesa glew openalSoft freealut wxGTK libogg freetype libvorbis
|
||||||
SDL SDL_net expat libjpeg libpng
|
SDL SDL_net expat libjpeg libpng fftwSinglePrec
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
|
Loading…
Reference in a new issue