treewide: Get rid of libGLU_combined

This commit is contained in:
adisbladis
2019-11-10 16:44:34 +00:00
parent e6963bc983
commit c9d8624ccd
241 changed files with 518 additions and 516 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, perl, libGLU_combined, xorg,
{ stdenv, fetchurl, makeWrapper, perl, libGLU, libGL, xorg,
version? "2.8", # What version
samples? false # Should samples be installed
}:
@@ -47,7 +47,7 @@ in stdenv.mkDerivation {
patches = stdenv.lib.attrByPath [version "patches"] [] src_info;
patchFlags = "-p0";
buildInputs = [ makeWrapper perl libGLU_combined xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ];
buildInputs = [ makeWrapper perl libGLU libGL xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ];
propagatedBuildInputs = [ stdenv.cc ];
NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm";
doCheck = false;