Merge pull request #101485 from sikmir/openscenegraph

openscenegraph: enable on darwin

authored by

Michael Raskin and committed by
GitHub
228b835d e09dbe3f

+6 -2
+3 -1
pkgs/development/libraries/openscenegraph/default.nix
··· 1 1 { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, 2 2 libX11, libXinerama, libXrandr, libGLU, libGL, 3 3 glib, ilmbase, libxml2, pcre, zlib, 4 + AGL, Carbon, Cocoa, Foundation, 4 5 jpegSupport ? true, libjpeg, 5 6 exrSupport ? false, openexr, 6 7 gifSupport ? true, giflib, ··· 60 61 ++ lib.optional sdlSupport SDL2 61 62 ++ lib.optionals restSupport [ asio boost ] 62 63 ++ lib.optionals withExamples [ fltk wxGTK ] 64 + ++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ] 63 65 ; 64 66 65 67 cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; ··· 68 70 description = "A 3D graphics toolkit"; 69 71 homepage = "http://www.openscenegraph.org/"; 70 72 maintainers = with maintainers; [ aanderse raskin ]; 71 - platforms = platforms.linux; 73 + platforms = with platforms; linux ++ darwin; 72 74 license = "OpenSceneGraph Public License - free LGPL-based license"; 73 75 }; 74 76 }
+3 -1
pkgs/top-level/all-packages.nix
··· 14785 14785 14786 14786 opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; 14787 14787 14788 - openscenegraph = callPackage ../development/libraries/openscenegraph { }; 14788 + openscenegraph = callPackage ../development/libraries/openscenegraph { 14789 + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Foundation; 14790 + }; 14789 14791 14790 14792 openslp = callPackage ../development/libraries/openslp {}; 14791 14793