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
@@ -1,5 +1,5 @@
{stdenv, fetchgit
, wxGTK, perl, python2, zlib, libGLU_combined, libX11
, wxGTK, perl, python2, zlib, libGLU, libGL, libX11
, automake, autoconf
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [autoconf automake];
buildInputs = [
wxGTK perl python2 zlib libGLU_combined libX11
wxGTK perl python2 zlib libGLU libGL libX11
];
# Link against Python explicitly as it is needed for scripts
@@ -1,4 +1,4 @@
{stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU_combined, libX11}:
{stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU, libGL, libX11}:
stdenv.mkDerivation rec {
pname = "golly";
version = "3.3";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
wxGTK perl python2 zlib libGLU_combined libX11
wxGTK perl python2 zlib libGLU libGL libX11
];
setSourceRoot = ''