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,7 +1,7 @@
{ stdenv, lib, perl, fetchurl, python2
, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openal, libGLU_combined, xorgproto, libX11, libXcursor, nspr, SDL2
, openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2
, gloox, nvidia-texture-tools
, withEditor ? true, wxGTK ? null
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
spidermonkey_38 boost icu libxml2 libpng libjpeg
zlib curl libogg libvorbis enet miniupnpc openal
libGLU_combined xorgproto libX11 libXcursor nspr SDL2 gloox
libGLU libGL xorgproto libX11 libXcursor nspr SDL2 gloox
nvidia-texture-tools libsodium
] ++ lib.optional withEditor wxGTK;