From 79914075f478272d5355515d6034d480d8d95940 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Thu, 12 May 2016 18:40:33 -0300 Subject: [PATCH 1/2] SDL: Revert "SDL: use mesa_noglu instead of mesa" This reverts commit a9a94df4e644168de200c3689d3c53100256bf74. --- pkgs/development/libraries/SDL/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 5d97a7fa59e..6c3920ff8aa 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_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; From 06436894a7c66f84d91e287296f920e2464f812b Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Wed, 11 May 2016 10:29:13 -0300 Subject: [PATCH 2/2] scorched3d: fix build by adding fftwSinglePrec --- pkgs/games/scorched3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 3a32e12101c..f64f9e38f00 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -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 ];