From a9a94df4e644168de200c3689d3c53100256bf74 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 24 Apr 2016 16:20:37 +0300 Subject: SDL: use mesa_noglu instead of mesa --- pkgs/development/libraries/SDL/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/SDL') diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 6c3920ff8aa86..5d97a7fa59ee3 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap -, openglSupport ? false, mesa ? null +, openglSupport ? false, mesa_noglu ? 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 != null && x11Support); +assert openglSupport -> (mesa_noglu != 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 ++ + optional openglSupport mesa_noglu ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; -- cgit 1.4.1