openscenegraph: fix build on darwin
This commit is contained in:
parent
8e5047b1f6
commit
4cdc34959b
|
@ -1,7 +1,7 @@
|
||||||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen,
|
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen,
|
||||||
libX11, libXinerama, libXrandr, libGLU, libGL,
|
libX11, libXinerama, libXrandr, libGLU, libGL,
|
||||||
glib, ilmbase, libxml2, pcre, zlib,
|
glib, ilmbase, libxml2, pcre, zlib,
|
||||||
AGL, Carbon, Cocoa, Foundation,
|
AGL, Accelerate, Carbon, Cocoa, Foundation,
|
||||||
boost,
|
boost,
|
||||||
jpegSupport ? true, libjpeg,
|
jpegSupport ? true, libjpeg,
|
||||||
exrSupport ? false, openexr,
|
exrSupport ? false, openexr,
|
||||||
|
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
||||||
++ lib.optional sdlSupport SDL2
|
++ lib.optional sdlSupport SDL2
|
||||||
++ lib.optional restSupport asio
|
++ lib.optional restSupport asio
|
||||||
++ lib.optionals withExamples [ fltk ]
|
++ lib.optionals withExamples [ fltk ]
|
||||||
++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ]
|
++ lib.optionals stdenv.isDarwin [ AGL Accelerate Carbon Cocoa Foundation ]
|
||||||
++ lib.optional (restSupport || colladaSupport) boost
|
++ lib.optional (restSupport || colladaSupport) boost
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
|
@ -23064,7 +23064,7 @@ with pkgs;
|
||||||
opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { };
|
opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { };
|
||||||
|
|
||||||
openscenegraph = callPackage ../development/libraries/openscenegraph {
|
openscenegraph = callPackage ../development/libraries/openscenegraph {
|
||||||
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Foundation;
|
inherit (darwin.apple_sdk.frameworks) AGL Accelerate Carbon Cocoa Foundation;
|
||||||
};
|
};
|
||||||
|
|
||||||
openslide = callPackage ../development/libraries/openslide { };
|
openslide = callPackage ../development/libraries/openslide { };
|
||||||
|
|
Loading…
Reference in a new issue