diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2016-11-05 20:13:04 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2016-11-16 20:51:12 +0100 |
commit | f3dbb0892c7f3bc4e9605e428b4292a451de0501 (patch) | |
tree | 06de7adc03af803134c5d31290e511e82fae171b /pkgs | |
parent | 16e511fe2d7871efd56fd39e2d3e34355b61b629 (diff) | |
download | nixlib-f3dbb0892c7f3bc4e9605e428b4292a451de0501.tar nixlib-f3dbb0892c7f3bc4e9605e428b4292a451de0501.tar.gz nixlib-f3dbb0892c7f3bc4e9605e428b4292a451de0501.tar.bz2 nixlib-f3dbb0892c7f3bc4e9605e428b4292a451de0501.tar.lz nixlib-f3dbb0892c7f3bc4e9605e428b4292a451de0501.tar.xz nixlib-f3dbb0892c7f3bc4e9605e428b4292a451de0501.tar.zst nixlib-f3dbb0892c7f3bc4e9605e428b4292a451de0501.zip |
freeglut: Use multiple outputs
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/freeglut/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 4135c451eebc..6737e059b212 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, xlibsWrapper, cmake }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa_noglu, mesa_glu, xlibsWrapper, cmake }: let version = "3.0.0"; in stdenv.mkDerivation { @@ -9,16 +9,20 @@ in stdenv.mkDerivation { sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra"; }; - buildInputs = [ libXi libXrandr libXxf86vm mesa xlibsWrapper cmake ]; + outputs = [ "out" "dev" ]; + + buildInputs = [ libXi libXrandr libXxf86vm mesa_noglu mesa_glu xlibsWrapper cmake ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ - "-DOPENGL_INCLUDE_DIR=${mesa}/include" - "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa}/lib/libGL.dylib" - "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa}/lib/libGLU.dylib" + "-DOPENGL_INCLUDE_DIR=${mesa_noglu}/include" + "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa_noglu}/lib/libGL.dylib" + "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa_glu}/lib/libGLU.dylib" "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Create and manage windows containing OpenGL contexts"; longDescription = '' |