From 550a372c868f078e118693b0edf0738995a86b47 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 13 Nov 2024 15:00:20 +0000
Subject: [PATCH] mvfst: convert to new Darwin SDK pattern

(cherry picked from commit 5b60e96f64c75a169768492ef30e125037242f66)
(cherry picked from commit 193326735b10ac43fdd60a4154429c77921f6c1d)
---
 pkgs/development/libraries/mvfst/default.nix | 23 +++++++++++---------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/mvfst/default.nix b/pkgs/development/libraries/mvfst/default.nix
index fe2513b2c220..429de18e2267 100644
--- a/pkgs/development/libraries/mvfst/default.nix
+++ b/pkgs/development/libraries/mvfst/default.nix
@@ -7,6 +7,8 @@
   folly,
   gflags,
   glog,
+  apple-sdk_11,
+  darwinMinVersionHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,16 +24,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
-    "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation
-  ];
-
-  buildInputs = [
-    fizz
-    folly
-    gflags
-    glog
-  ];
+  buildInputs =
+    [
+      fizz
+      folly
+      gflags
+      glog
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_11
+      (darwinMinVersionHook "11.0")
+    ];
 
   meta = with lib; {
     description = "Implementation of the QUIC transport protocol";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75092775518d..6e46a90852c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10349,7 +10349,7 @@ with pkgs;
 
   mpich-pmix = mpich.override { pmixSupport = true; withPm = [ ]; };
 
-  mvfst = darwin.apple_sdk_11_0.callPackage ../development/libraries/mvfst { };
+  mvfst = callPackage ../development/libraries/mvfst { };
 
   mygpoclient = with python3.pkgs; toPythonApplication mygpoclient;