public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Get rid of libGLU_combined

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/opencsg/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, libGLU_combined, freeglut, glew, libXmu, libXext, libX11
{stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11
, qmake, GLUT, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ glew ]
++ stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut libXmu libXext libX11 ]
++ stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ]
++ stdenv.lib.optional stdenv.isDarwin GLUT;
doCheck = false;