diff options
| author | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 14:06:44 +0200 |
|---|---|---|
| committer | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 17:03:46 +0200 |
| commit | 8f2a22935c31140891591ed3bb3e6baf230bc4f0 (patch) | |
| tree | 30cd829c96a4abaffff99dcc027eba0e2e064ef1 /pkgs/development/libraries/freeglut | |
| parent | 8da9b485ec008c9c7c4adcfa604a289b3050c2c6 (diff) | |
| download | nixlib-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar nixlib-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.gz nixlib-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.bz2 nixlib-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.lz nixlib-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.xz nixlib-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.zst nixlib-8f2a22935c31140891591ed3bb3e6baf230bc4f0.zip | |
treewide: transition from mesa_noglu to libGL
Diffstat (limited to 'pkgs/development/libraries/freeglut')
| -rw-r--r-- | pkgs/development/libraries/freeglut/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 6737e059b212..954af72f9c15 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -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" |