about summary refs log tree commit diff
path: root/pkgs/development/libraries/freeglut
diff options
context:
space:
mode:
authorAlexander V. Nikolaev <avn@avnik.info>2018-02-24 14:59:47 +0200
committerAlexander V. Nikolaev <avn@avnik.info>2018-02-24 17:05:43 +0200
commit1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a (patch)
tree05a1695ab74385d7b4a7ccac1e4bd2fc601c1d15 /pkgs/development/libraries/freeglut
parent8f2a22935c31140891591ed3bb3e6baf230bc4f0 (diff)
downloadnixlib-1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a.tar
nixlib-1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a.tar.gz
nixlib-1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a.tar.bz2
nixlib-1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a.tar.lz
nixlib-1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a.tar.xz
nixlib-1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a.tar.zst
nixlib-1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a.zip
treewide: transition from mesa_glu to libGLU
Diffstat (limited to 'pkgs/development/libraries/freeglut')
-rw-r--r--pkgs/development/libraries/freeglut/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index 954af72f9c15..c34d9591d386 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, mesa_glu, xlibsWrapper, cmake }:
+{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }:
 
 let version = "3.0.0";
 in stdenv.mkDerivation {
@@ -11,12 +11,12 @@ in stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ libXi libXrandr libXxf86vm libGL mesa_glu xlibsWrapper cmake ];
+  buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper cmake ];
 
   cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
                  "-DOPENGL_INCLUDE_DIR=${libGL}/include"
                  "-DOPENGL_gl_LIBRARY:FILEPATH=${libGL}/lib/libGL.dylib"
-                 "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa_glu}/lib/libGLU.dylib"
+                 "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib"
                  "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF"
                  "-DFREEGLUT_BUILD_STATIC:BOOL=OFF"
                ];