treewide: transition from mesa_glu to libGLU
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, vlc
|
||||
, libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng
|
||||
, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib
|
||||
, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
let
|
||||
@@ -9,7 +9,7 @@ let
|
||||
name = "megaglest-lib-env";
|
||||
paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext
|
||||
xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype
|
||||
stdenv.cc.cc glew mesa_glu wxGTK ];
|
||||
stdenv.cc.cc glew libGLU wxGTK ];
|
||||
};
|
||||
path-env = buildEnv {
|
||||
name = "megaglest-path-env";
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg vlc wxGTK
|
||||
glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ];
|
||||
glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ];
|
||||
|
||||
configurePhase = ''
|
||||
cmake -DCMAKE_INSTALL_PREFIX=$out \
|
||||
|
||||
Reference in New Issue
Block a user