public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #101485 from sikmir/openscenegraph

Browse Source 
openscenegraph: enable on darwin
This commit is contained in:
Michael Raskin 2020-10-23 20:43:44 +00:00 committed by GitHub
commit 228b835dd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/openscenegraph/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, 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,
jpegSupport ? true, libjpeg, jpegSupport ? true, libjpeg,
exrSupport ? false, openexr, exrSupport ? false, openexr,
gifSupport ? true, giflib, gifSupport ? true, giflib,
@ -60,6 +61,7 @@ stdenv.mkDerivation rec {
++ lib.optional sdlSupport SDL2 ++ lib.optional sdlSupport SDL2
++ lib.optionals restSupport [ asio boost ] ++ lib.optionals restSupport [ asio boost ]
++ lib.optionals withExamples [ fltk wxGTK ] ++ 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"; 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"; description = "A 3D graphics toolkit";
homepage = "http://www.openscenegraph.org/"; homepage = "http://www.openscenegraph.org/";
maintainers = with maintainers; [ aanderse raskin ]; maintainers = with maintainers; [ aanderse raskin ];
platforms = platforms.linux; platforms = with platforms; linux ++ darwin;
license = "OpenSceneGraph Public License - free LGPL-based license"; license = "OpenSceneGraph Public License - free LGPL-based license";
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -14785,7 +14785,9 @@ in
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;
};
openslp = callPackage ../development/libraries/openslp {}; openslp = callPackage ../development/libraries/openslp {};