treewide: Get rid of libGLU_combined

2019-11-18 20:10:43 +00:00
parent e6963bc983
commit c9d8624ccd
241 changed files with 518 additions and 516 deletions
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, libGLU_combined, pkgconfig, libpulseaudio
+{ stdenv, lib, fetchurl, cmake, libGLU, libGL, pkgconfig, libpulseaudio
 , qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qttools ? null
 , withQt5 ? false
 , debug ? false }:
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
  };

  buildInputs =
-    [ libGLU_combined libpulseaudio ]
+    [ libGLU libGL libpulseaudio ]
    ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]);

  nativeBuildInputs =