Unverified Commit 228b835d authored by Michael Raskin's avatar Michael Raskin Committed by GitHub
Browse files

Merge pull request #101485 from sikmir/openscenegraph 

openscenegraph: enable on darwin
parents e09dbe3f 4b545dae

pkgs/development/libraries/openscenegraph/default.nix

+3 −1
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen,

  libX11, libXinerama, libXrandr, libGLU, libGL,

  glib, ilmbase, libxml2, pcre, zlib,

  AGL, Carbon, Cocoa, Foundation,

  jpegSupport ? true, libjpeg,

  exrSupport ? false, openexr,

  gifSupport ? true, giflib,
@@ -60,6 +61,7 @@ stdenv.mkDerivation rec { 
    ++ lib.optional sdlSupport SDL2

    ++ lib.optionals restSupport [ asio boost ]

    ++ lib.optionals withExamples [ fltk wxGTK ]

    ++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ]

  ;



  cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON";
@@ -68,7 +70,7 @@ stdenv.mkDerivation rec { 
    description = "A 3D graphics toolkit";

    homepage = "http://www.openscenegraph.org/";

    maintainers = with maintainers; [ aanderse raskin ];

    platforms = platforms.linux;

    platforms = with platforms; linux ++ darwin;

    license = "OpenSceneGraph Public License - free LGPL-based license";

  };

}

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -14785,7 +14785,9 @@ in 














  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;













  };





























  openslp = callPackage ../development/libraries/openslp {};