From 4d961ec1504fb112c76b8fe7f684d739fe5ffe03 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH] darwin.libutil: use default SDK on Darwin (14.4) --- .../apple-source-releases/libutil/package.nix | 7 ----- .../0001-Conditionally-pre-condition.patch | 26 ------------------- 2 files changed, 33 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix index 95f35054e026..a0afe4511d53 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix @@ -1,5 +1,4 @@ { - apple-sdk_14, copyfile, mkAppleDerivation, }: @@ -15,13 +14,7 @@ mkAppleDerivation { xcodeHash = "sha256-LwR9fmvcdJ/QYlOx+7ffhV4mKvjkwN3rX3+yHSCovKQ="; - patches = [ - # The only change from macOS 13 to 14 was setting this flag. Check at runtime and only set if supported. - ./patches/0001-Conditionally-pre-condition.patch - ]; - buildInputs = [ - (apple-sdk_14.override { enableBootstrap = true; }) copyfile ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch b/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch deleted file mode 100644 index 27f5faee7cda..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ca796729722da704e8a9c64c7a201cbe0a9cb9be Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Mon, 5 Aug 2024 22:21:47 -0400 -Subject: [PATCH] Conditionally pre-condition - ---- - wipefs.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/wipefs.cpp b/wipefs.cpp -index d8e6339..6cb7963 100644 ---- a/wipefs.cpp -+++ b/wipefs.cpp -@@ -391,7 +391,9 @@ wipefs_wipe(wipefs_ctx handle) - // Since we always issue a a single extent, set the kIOStorageUnmapOptionWhole - // option flag for drive pre-conditioning. - // -- unmap.options = kIOStorageUnmapOptionWhole; -+ if (__builtin_available(macOS 14.0, *)) { -+ unmap.options = kIOStorageUnmapOptionWhole; -+ } - - // - // Don't bother to check the return value since this is mostly --- -2.44.1