From f46f5f6e032f197a18f9399e389f97ea8eca1787 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 13 Nov 2024 16:03:57 +0000
Subject: [PATCH] edencommon: convert to new Darwin SDK pattern

(cherry picked from commit 3c14c26a35418f54f3ec3f1d767a92de8fdb5341)
(cherry picked from commit 353788c210496995fbd4c58af73362558999da14)
---
 .../libraries/edencommon/default.nix          | 21 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/edencommon/default.nix b/pkgs/development/libraries/edencommon/default.nix
index ef930814e021..d9f659e24191 100644
--- a/pkgs/development/libraries/edencommon/default.nix
+++ b/pkgs/development/libraries/edencommon/default.nix
@@ -6,6 +6,8 @@
   folly,
   glog,
   gtest,
+  apple-sdk_11,
+  darwinMinVersionHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -26,15 +28,16 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
-    "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation
-  ];
-
-  buildInputs = [
-    glog
-    folly
-    gtest
-  ];
+  buildInputs =
+    [
+      glog
+      folly
+      gtest
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_11
+      (darwinMinVersionHook "11.0")
+    ];
 
   meta = with lib; {
     description = "Shared library for Meta's source control filesystem tools (EdenFS and Watchman)";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae19a192181d..c4582e83af8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9022,7 +9022,7 @@ with pkgs;
     stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv;
   };
 
-  edencommon = darwin.apple_sdk_11_0.callPackage ../development/libraries/edencommon { };
+  edencommon = callPackage ../development/libraries/edencommon { };
 
   eigen = callPackage ../development/libraries/eigen { };