From 7d0b2bec84a0a0972e162e38edad0894e75c4687 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 13 Nov 2024 16:11:15 +0000
Subject: [PATCH] watchman: convert to new Darwin SDK pattern

(cherry picked from commit 1c60ec77f4081f5ff616f8b50a21b967e99c10eb)
(cherry picked from commit bbb05186d971dacb2dbb704f9224a197cb57fc70)
---
 pkgs/development/tools/watchman/default.nix | 64 ++++++++++-----------
 pkgs/top-level/all-packages.nix             |  4 +-
 2 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix
index a57faaff6259..f91f53389f58 100644
--- a/pkgs/development/tools/watchman/default.nix
+++ b/pkgs/development/tools/watchman/default.nix
@@ -1,7 +1,6 @@
 {
   cargo,
   cmake,
-  CoreServices,
   cpptoml,
   double-conversion,
   edencommon,
@@ -16,7 +15,6 @@
   gtest,
   lib,
   libevent,
-  libiconv,
   libsodium,
   libunwind,
   lz4,
@@ -29,6 +27,8 @@
   stdenv,
   wangle,
   zstd,
+  apple-sdk_11,
+  darwinMinVersionHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -42,16 +42,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-cD8mIYCc+8Z2p3rwKVRFcW9sOBbpb5KHU5VpbXHMpeg=";
   };
 
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS=ON"
-      "-DENABLE_EDEN_SUPPORT=NO" # requires sapling (formerly known as eden), which is not packaged in nixpkgs
-      "-DWATCHMAN_STATE_DIR=${stateDir}"
-      "-DWATCHMAN_VERSION_OVERRIDE=${version}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation
-    ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DENABLE_EDEN_SUPPORT=NO" # requires sapling (formerly known as eden), which is not packaged in nixpkgs
+    "-DWATCHMAN_STATE_DIR=${stateDir}"
+    "-DWATCHMAN_VERSION_OVERRIDE=${version}"
+  ];
 
   nativeBuildInputs = [
     cmake
@@ -62,26 +58,30 @@ stdenv.mkDerivation rec {
     rustc
   ];
 
-  buildInputs = [
-    pcre2
-    openssl
-    gtest
-    glog
-    libevent
-    libsodium
-    folly
-    fizz
-    wangle
-    fbthrift
-    fb303
-    cpptoml
-    edencommon
-    libunwind
-    double-conversion
-    lz4
-    zstd
-    libiconv
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
+  buildInputs =
+    [
+      pcre2
+      openssl
+      gtest
+      glog
+      libevent
+      libsodium
+      folly
+      fizz
+      wangle
+      fbthrift
+      fb303
+      cpptoml
+      edencommon
+      libunwind
+      double-conversion
+      lz4
+      zstd
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_11
+      (darwinMinVersionHook "11.0")
+    ];
 
   cargoRoot = "watchman/cli";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0caf084eaf96..8b419fe53aab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5591,9 +5591,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa AppKit;
   };
 
-  watchman = darwin.apple_sdk_11_0.callPackage ../development/tools/watchman {
-    inherit (darwin.apple_sdk_11_0.frameworks) CoreServices;
-  };
+  watchman = callPackage ../development/tools/watchman { };
 
   webassemblyjs-cli = nodePackages."@webassemblyjs/cli-1.11.1";
   webassemblyjs-repl = nodePackages."@webassemblyjs/repl-1.11.1";