From 4cdc34959b66e7613bc246c1557ac4eb91b2ee1c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 27 Apr 2023 21:11:16 +0300 Subject: [PATCH] openscenegraph: fix build on darwin --- pkgs/development/libraries/openscenegraph/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 891c5121b0e7..8fc4539c6687 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,7 +1,7 @@ { 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 ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82e27448e190..f122e99aed67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23064,7 +23064,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 { };