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,5 +1,5 @@
{ fetchurl, stdenv, lib
, cmake, libGLU_combined
, cmake, libGLU, libGL
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, libX11, libXmu, libSM, pkgconfig
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
buildInputs =
[ cmake libGLU_combined
[ cmake libGLU libGL
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
libX11 libXmu libSM pkgconfig
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchFromGitHub, stdenv, lib
, cmake, libGLU_combined
, cmake, libGLU, libGL
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, libX11, libXmu, libSM, pkgconfig
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs =
[ cmake libGLU_combined
[ cmake libGLU libGL
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
libX11 libXmu libSM pkgconfig
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, lib
, cmake, libGLU_combined
, cmake, libGLU, libGL
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, libX11, libXmu, libSM, pkgconfig
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs =
[ cmake libGLU_combined
[ cmake libGLU libGL
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
libX11 libXmu libSM pkgconfig