alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #15422 from rardiol/scorched3d

Browse source 
scorched3d update and SDL1.2 opengl fix
This commit is contained in:
Nikolay Amiantov 2016-05-13 02:00:16 +03:00
parent 21747ef768 06436894a7
commit f67b8f8e64
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/SDL/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap
, openglSupport ? false, mesa_noglu ? null
, openglSupport ? false, mesa ? null
, alsaSupport ? true, alsaLib ? null
, x11Support ? true, xlibsWrapper ? null, libXrandr ? null
, pulseaudioSupport ? true, libpulseaudio ? null
@ -10,7 +10,7 @@
# PulseAudio.
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 alsaSupport -> alsaLib != null;
assert pulseaudioSupport -> libpulseaudio != null;
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
optionals x11Support [ xlibsWrapper libXrandr ] ++
optional alsaSupport alsaLib ++
optional stdenv.isLinux libcap ++
optional openglSupport mesa_noglu ++
optional openglSupport mesa ++
optional pulseaudioSupport libpulseaudio ++
optional stdenv.isDarwin Cocoa;

2
pkgs/games/scorched3d/default.nix
View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ mesa glew openalSoft freealut wxGTK libogg freetype libvorbis
SDL SDL_net expat libjpeg libpng
SDL SDL_net expat libjpeg libpng fftwSinglePrec
];
nativeBuildInputs = [ pkgconfig ];