From adce32e028ecedb3fda532ced186510ed5e14a8e Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Mon, 18 Dec 2023 19:41:32 -0600
Subject: [PATCH 1/2] pcl: rename withCuda to cudaSupport

---
 pkgs/development/libraries/pcl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index 31198124faac..624ca4aa6672 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -19,7 +19,7 @@
 , AGL
 , OpenGL
 , config
-, withCuda ? config.cudaSupport, cudaPackages
+, cudaSupport ? config.cudaSupport, cudaPackages
 }:
 
 stdenv.mkDerivation rec {
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     cmake
     wrapQtAppsHook
   ]
-  ++ lib.optionals withCuda [ cudaPackages.cuda_nvcc ];
+  ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
 
   buildInputs = [
     eigen
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = lib.optionals stdenv.isDarwin [
     "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
-  ] ++ lib.optionals withCuda [ "-DWITH_CUDA=true" ];
+  ] ++ lib.optionals cudaSupport [ "-DWITH_CUDA=true" ];
 
   meta = {
     homepage = "https://pointclouds.org/";

From 9c90a963a079074af92a11335d8b4924a93da9e2 Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Mon, 18 Dec 2023 19:42:57 -0600
Subject: [PATCH 2/2] pcl: fix build on darwin

This has been broken on Hydra for a while (presumably due to the SDK
being out of date). Fix it by using the 11.0 SDK.
---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91535dc67b97..ce12a32c0973 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24476,7 +24476,8 @@ with pkgs;
   pcg_c = callPackage ../development/libraries/pcg-c { };
 
   pcl = libsForQt5.callPackage ../development/libraries/pcl {
-    inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL;
+    stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
+    inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL;
   };
 
   pcre = callPackage ../development/libraries/pcre { };