From 289a4465d9d17cd83a0400124b7c331f881b3c9e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 13 Nov 2024 12:17:25 +0000
Subject: [PATCH] folly: convert to new Darwin SDK pattern

This is using unguarded 11.0 APIs, so bump the deployment target too.

(cherry picked from commit 89e641930d8e38c22ace2459de9ed5d59e303b9c)
(cherry picked from commit 45e6e0f628abc7f29b0e7ef18137a1a23a5a7ba1)
---
 pkgs/development/libraries/folly/default.nix | 63 +++++++++++---------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 10cdff67cd55..8ceedfd73ba4 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -18,6 +18,8 @@
   zlib,
   zstd,
   jemalloc,
+  apple-sdk_11,
+  darwinMinVersionHook,
   follyMobile ? false,
 
   # for passthru.tests
@@ -42,21 +44,27 @@ stdenv.mkDerivation rec {
   ];
 
   # See CMake/folly-deps.cmake in the Folly source tree.
-  buildInputs = [
-    boost
-    double-conversion
-    glog
-    gflags
-    libevent
-    libiberty
-    openssl
-    lz4
-    xz
-    zlib
-    libunwind
-    fmt_8
-    zstd
-  ] ++ lib.optional stdenv.hostPlatform.isLinux jemalloc;
+  buildInputs =
+    [
+      boost
+      double-conversion
+      glog
+      gflags
+      libevent
+      libiberty
+      openssl
+      lz4
+      xz
+      zlib
+      libunwind
+      fmt_8
+      zstd
+    ]
+    ++ lib.optional stdenv.hostPlatform.isLinux jemalloc
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_11
+      (darwinMinVersionHook "11.0")
+    ];
 
   # jemalloc headers are required in include/folly/portability/Malloc.h
   propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux jemalloc;
@@ -65,22 +73,19 @@ stdenv.mkDerivation rec {
     "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}"
     "-fpermissive"
   ];
-  cmakeFlags =
-    [
-      "-DBUILD_SHARED_LIBS=ON"
 
-      # temporary hack until folly builds work on aarch64,
-      # see https://github.com/facebook/folly/issues/1880
-      "-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.hostPlatform.isx86_64 then "x86_64" else "dummy"}"
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
 
-      # ensure correct dirs in $dev/lib/pkgconfig/libfolly.pc
-      # see https://github.com/NixOS/nixpkgs/issues/144170
-      "-DCMAKE_INSTALL_INCLUDEDIR=include"
-      "-DCMAKE_INSTALL_LIBDIR=lib"
-    ]
-    ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-      "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13"
-    ];
+    # temporary hack until folly builds work on aarch64,
+    # see https://github.com/facebook/folly/issues/1880
+    "-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.hostPlatform.isx86_64 then "x86_64" else "dummy"}"
+
+    # ensure correct dirs in $dev/lib/pkgconfig/libfolly.pc
+    # see https://github.com/NixOS/nixpkgs/issues/144170
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+  ];
 
   # split outputs to reduce downstream closure sizes
   outputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad8654674b61..bf8a5c8e6d48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9148,7 +9148,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation;
   };
 
-  folly = darwin.apple_sdk_11_0.callPackage ../development/libraries/folly { };
+  folly = callPackage ../development/libraries/folly { };
 
   makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { };