From 152d24ff5b60432cc3c2ff67e7b4b83831a65804 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 13 Nov 2024 15:44:26 +0000
Subject: [PATCH] wangle: convert to new Darwin SDK pattern

(cherry picked from commit b21418c8d81f68502d196c4fcfaad1197413b2ce)
(cherry picked from commit 53c52162be756785e5839c24e0810eb26ce9efd7)
---
 pkgs/development/libraries/wangle/default.nix | 31 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/wangle/default.nix b/pkgs/development/libraries/wangle/default.nix
index c4ce19bd426e..26271c5f0ac7 100644
--- a/pkgs/development/libraries/wangle/default.nix
+++ b/pkgs/development/libraries/wangle/default.nix
@@ -11,6 +11,8 @@
   fizz,
   folly,
   gtest,
+  apple-sdk_11,
+  darwinMinVersionHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -28,25 +30,26 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeDir = "../wangle";
 
-  cmakeFlags =
+  cmakeFlags = [
+    "-Wno-dev"
+    (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
+  ];
+
+  buildInputs =
     [
-      "-Wno-dev"
-      (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
+      double-conversion
+      fizz
+      folly
+      glog
+      gflags
+      libevent
+      openssl
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation
+      apple-sdk_11
+      (darwinMinVersionHook "11.0")
     ];
 
-  buildInputs = [
-    double-conversion
-    fizz
-    folly
-    glog
-    gflags
-    libevent
-    openssl
-  ];
-
   doCheck = true;
   checkInputs = [
     gtest
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c59a49d35650..60997905ca75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11100,7 +11100,7 @@ with pkgs;
   vulkan-tools = callPackage ../tools/graphics/vulkan-tools {
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
   };
-  wangle = darwin.apple_sdk_11_0.callPackage ../development/libraries/wangle { };
+  wangle = callPackage ../development/libraries/wangle { };
 
   wayland = darwin.apple_sdk_11_0.callPackage ../development/libraries/wayland { };
   wayland-scanner = callPackage ../development/libraries/wayland/scanner.nix { };