public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: make the attribute include the GL/glu.h

Browse Source 
Packages expect it and it used to be true until mesa-9*.
This seems to be the easiest fix, otherwise many changes would be needed.
This commit is contained in:
Vladimír Čunát
2013-01-31 22:44:31 +01:00
parent d85a587fdd
commit aa0fb73064
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/SDL/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, audiofile
, openglSupport ? false, mesa ? null, mesa_glu ? null
, openglSupport ? false, mesa ? null
, alsaSupport ? true, alsaLib ? null
, x11Support ? true, x11 ? null, libXrandr ? null
, pulseaudioSupport ? true, pulseaudio ? null
@@ -9,7 +9,7 @@
# PulseAudio.
assert alsaSupport || pulseaudioSupport;
assert openglSupport -> (mesa != null && mesa_glu != null && x11Support);
assert openglSupport -> (mesa != null && x11Support);
assert x11Support -> (x11 != null && libXrandr != null);
assert alsaSupport -> alsaLib != null;
assert pulseaudioSupport -> pulseaudio != null;
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optional pulseaudioSupport pulseaudio;
buildInputs = [ pkgconfig audiofile ] ++
stdenv.lib.optional openglSupport [ mesa mesa_glu ] ++
stdenv.lib.optional openglSupport [ mesa ] ++
stdenv.lib.optional alsaSupport alsaLib;
# XXX: By default, SDL wants to dlopen() PulseAudio, in which case