From c174d176f00176b7437984e2f97a6b07d6877867 Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Sun, 4 Feb 2024 00:46:53 +1300 Subject: [PATCH] opensubdiv: add metal support Apply suggestions from code review Co-authored-by: Pol Dellaiera Apply suggestions: split darwin frameworks into individual lines, use cmakeBool for metal support --- .../development/libraries/opensubdiv/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index e3bf614d9886..17b7c286229b 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -31,9 +31,17 @@ stdenv.mkDerivation rec { glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama xorg.libXi ] - ++ lib.optional (openclSupport && !stdenv.isDarwin) ocl-icd - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [OpenCL Cocoa CoreVideo IOKit AppKit AGL ]) - ++ lib.optional cudaSupport [ + ++ lib.optionals (openclSupport && !stdenv.isDarwin) [ ocl-icd ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + OpenCL + Cocoa + CoreVideo + IOKit + AppKit + AGL + MetalKit + ]) + ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; @@ -50,7 +58,7 @@ stdenv.mkDerivation rec { [ "-DNO_TUTORIALS=1" "-DNO_REGRESSION=1" "-DNO_EXAMPLES=1" - "-DNO_METAL=1" # don’t have metal in apple sdk + (lib.cmakeBool "NO_METAL" (!stdenv.isDarwin)) (lib.cmakeBool "NO_OPENCL" (!openclSupport)) (lib.cmakeBool "NO_CUDA" (!cudaSupport)) ] ++ lib.optionals (!stdenv.isDarwin) [