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

treewide: transition from mesa_noglu to libGL

Browse Source
This commit is contained in:
Alexander V. Nikolaev
2018-02-24 17:03:46 +02:00
parent 8da9b485ec
commit 8f2a22935c
50 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/freeglut/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa_noglu, mesa_glu, xlibsWrapper, cmake }:
{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, mesa_glu, xlibsWrapper, cmake }:
let version = "3.0.0";
in stdenv.mkDerivation {
@@ -11,11 +11,11 @@ in stdenv.mkDerivation {
outputs = [ "out" "dev" ];
buildInputs = [ libXi libXrandr libXxf86vm mesa_noglu mesa_glu xlibsWrapper cmake ];
buildInputs = [ libXi libXrandr libXxf86vm libGL mesa_glu xlibsWrapper cmake ];
cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
"-DOPENGL_INCLUDE_DIR=${mesa_noglu}/include"
"-DOPENGL_gl_LIBRARY:FILEPATH=${mesa_noglu}/lib/libGL.dylib"
"-DOPENGL_INCLUDE_DIR=${libGL}/include"
"-DOPENGL_gl_LIBRARY:FILEPATH=${libGL}/lib/libGL.dylib"
"-DOPENGL_glu_LIBRARY:FILEPATH=${mesa_glu}/lib/libGLU.dylib"
"-DFREEGLUT_BUILD_DEMOS:BOOL=OFF"
"-DFREEGLUT_BUILD_STATIC:BOOL=OFF"