Unverified Commit d6bde74d authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #228575 from wegank/openscenegraph-darwin 

openscenegraph: fix build on darwin
parents 5b085abe 4cdc3495

pkgs/development/libraries/openscenegraph/default.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen,

  libX11, libXinerama, libXrandr, libGLU, libGL,

  glib, ilmbase, libxml2, pcre, zlib,

  AGL, Carbon, Cocoa, Foundation,

  AGL, Accelerate, Carbon, Cocoa, Foundation,

  boost,

  jpegSupport ? true, libjpeg,

  exrSupport ? false, openexr,
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec { 
    ++ lib.optional sdlSupport SDL2

    ++ lib.optional restSupport asio

    ++ 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

  ;

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -23066,7 +23066,7 @@ with pkgs; 
  opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { };















  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 { };