treewide: transition mesa to libGLU_combined

This commit is contained in:
Alexander V. Nikolaev
2018-02-24 17:06:49 +02:00
parent 1bc1909e5b
commit 0acec7e984
273 changed files with 572 additions and 572 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, SDL, mesa, expat, zlib, SDL_ttf, SDL_image }:
{ stdenv, fetchurl, libX11, SDL, libGLU_combined, expat, zlib, SDL_ttf, SDL_image }:
stdenv.mkDerivation rec {
version = "1.5.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
libX11 SDL SDL_ttf SDL_image mesa expat zlib
libX11 SDL SDL_ttf SDL_image libGLU_combined expat zlib
];
NIX_LDFLAGS = [ "-lX11" ];
+2 -2
View File
@@ -1,7 +1,7 @@
{stdenv, fetchurl, libX11, libSM, SDL, mesa, expat, SDL_ttf, SDL_image, zlib}:
{stdenv, fetchurl, libX11, libSM, SDL, libGLU_combined, expat, SDL_ttf, SDL_image, zlib}:
let
buildInputs = [
libX11 libSM SDL SDL_ttf SDL_image mesa expat zlib
libX11 libSM SDL SDL_ttf SDL_image libGLU_combined expat zlib
];
in
stdenv.mkDerivation rec {