From 4b545daec4c35c64ab632b9f661906cf4a53a88d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 23 Oct 2020 21:25:05 +0300 Subject: [PATCH] openscenegraph: enable on darwin --- pkgs/development/libraries/openscenegraph/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 4ded4770fc81..e2a52a933333 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,6 +1,7 @@ { 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"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b07bd0db037..ec008b60c2fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14779,7 +14779,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 {};