treewide: Get rid of libGLU_combined

This commit is contained in:
adisbladis
2019-11-18 20:10:43 +00:00
parent e6963bc983
commit c9d8624ccd
241 changed files with 518 additions and 516 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, SDL, libGLU_combined, expat, zlib, SDL_ttf, SDL_image }:
{ stdenv, fetchurl, libX11, SDL, libGLU, libGL, 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 libGLU_combined expat zlib
libX11 SDL SDL_ttf SDL_image libGLU libGL expat zlib
];
NIX_LDFLAGS = [ "-lX11" ];
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, libSM, SDL, libGLU_combined, expat, SDL_ttf
{ stdenv, fetchurl, libX11, libSM, SDL, libGLU, libGL, expat, SDL_ttf
, SDL_image, zlib, libXxf86misc }:
stdenv.mkDerivation rec {
pname = "xpilot-ng";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "02a7pnp88kh88fzda5q8mzlckk6y9r5fw47j00h26wbsfly0k1zj";
};
buildInputs = [
libX11 libSM SDL SDL_ttf SDL_image libGLU_combined expat zlib libXxf86misc
libX11 libSM SDL SDL_ttf SDL_image libGLU libGL expat zlib libXxf86misc
];
meta = with stdenv.lib; {
description = "A multiplayer X11 space combat game";