mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

SDL: Revert "SDL: use mesa_noglu instead of mesa"

Browse source 
This reverts commit a9a94df4e6.
This commit is contained in:
Ricardo Ardissone 2016-05-12 18:40:33 -03:00
parent 8ce8226655
commit 79914075f4
1 changed files with 3 additions and 3 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;