pkgs/by-name/[abc].+ Migrate to new Darwin SDK

pkgs/by-name/ae/aegisub/package.nix

@@ -4,7 +4,6 @@
   boost,
   cmake,
   config,
-  darwin,
   expat,
   fetchFromGitHub,
   fetchpatch,
@@ -46,16 +45,6 @@
   useBundledLuaJIT ? false,
 }:
 
-let
-  inherit (darwin.apple_sdk.frameworks)
-    AppKit
-    Carbon
-    Cocoa
-    CoreFoundation
-    CoreText
-    IOKit
-    OpenAL;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "aegisub";
   version = "3.3.3";
@@ -101,20 +90,10 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ]
   ++ lib.optionals alsaSupport [ alsa-lib ]
-  ++ lib.optionals openalSupport [
-    (if stdenv.hostPlatform.isDarwin then OpenAL else openal)
-  ]
+  ++ lib.optionals (openalSupport && !stdenv.hostPlatform.isDarwin) [ openal ]
   ++ lib.optionals portaudioSupport [ portaudio ]
   ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
-  ++ lib.optionals spellcheckSupport [ hunspell ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    AppKit
-    Carbon
-    Cocoa
-    CoreFoundation
-    CoreText
-    IOKit
-  ];
+  ++ lib.optionals spellcheckSupport [ hunspell ];
 
   hardeningDisable = [
     "bindnow"
@@ -148,6 +127,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeBuildDir = "build-directory";
 
+  cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && !openalSupport) [
+    # OpenAL is in the SDK and linked unless we disable it
+    "-DWITH_OPENAL=OFF"
+  ];
+
   strictDeps = true;
 
   meta = {
@@ -161,9 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd
     # softwares - so the resulting program will be GPL
-    license = with lib.licenses; [
-      bsd3
-    ];
+    license = with lib.licenses; [ bsd3 ];
     mainProgram = "aegisub";
     maintainers = with lib.maintainers; [ AndersonTorres wegank ];
     platforms = lib.platforms.unix;

pkgs/by-name/ai/aiken/package.nix

@@ -4,8 +4,6 @@
   pkg-config,
   rustPlatform,
   fetchFromGitHub,
-  darwin,
-  stdenv,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -21,16 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-aylmZFb+UaK3OEpJLOf4NuT4uMLRhdUg+cSjzxRo7t8=";
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        Security
-        CoreServices
-        SystemConfiguration
-      ]
-    );
+  buildInputs = [ openssl ];
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/am/amp/package.nix

@@ -9,7 +9,6 @@
   xorg,
   cmake,
   libgit2,
-  darwin,
   curl,
 }:
 
@@ -33,20 +32,11 @@ rustPlatform.buildRustPackage rec {
     pkg-config
     python3
   ];
-  buildInputs =
-    [
-      openssl
-      xorg.libxcb
-      libgit2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        curl
-        Security
-        AppKit
-      ]
-    );
+  buildInputs = [
+    openssl
+    xorg.libxcb
+    libgit2
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ];
 
   # Tests need to write to the theme directory in HOME.
   preCheck = "export HOME=`mktemp -d`";

pkgs/by-name/ar/arti/package.nix

@@ -6,7 +6,6 @@
   pkg-config,
   sqlite,
   openssl,
-  darwin,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -26,15 +25,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
 
-  buildInputs =
-    [ sqlite ]
-    ++ lib.optionals stdenv.isLinux [ openssl ]
-    ++ lib.optionals stdenv.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        CoreServices
-      ]
-    );
+  buildInputs = [ sqlite ] ++ lib.optionals stdenv.isLinux [ openssl ];
 
   cargoBuildFlags = [
     "--package"

pkgs/by-name/at/attic-client/package.nix

@@ -1,14 +1,14 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, nix
-, nixosTests
-, boost
-, pkg-config
-, stdenv
-, installShellFiles
-, darwin
-, crates ? [ "attic-client" ]
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix,
+  nixosTests,
+  boost,
+  pkg-config,
+  stdenv,
+  installShellFiles,
+  crates ? [ "attic-client" ],
 }:
 rustPlatform.buildRustPackage {
   pname = "attic";
@@ -29,9 +29,7 @@ rustPlatform.buildRustPackage {
   buildInputs = [
     nix
     boost
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
-    SystemConfiguration
-  ]);
+  ];
 
   cargoLock = {
     lockFile = ./Cargo.lock;
@@ -66,7 +64,10 @@ rustPlatform.buildRustPackage {
     description = "Multi-tenant Nix Binary Cache";
     homepage = "https://github.com/zhaofengli/attic";
     license = licenses.asl20;
-    maintainers = with maintainers; [ zhaofengli aciceri ];
+    maintainers = with maintainers; [
+      zhaofengli
+      aciceri
+    ];
     platforms = platforms.linux ++ platforms.darwin;
     mainProgram = "attic";
   };

pkgs/by-name/az/azurite/package.nix

@@ -1,11 +1,11 @@
-{ lib
-, buildNpmPackage
-, fetchFromGitHub
-, stdenv
-, darwin
-, libsecret
-, pkg-config
-, python3
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  stdenv,
+  libsecret,
+  pkg-config,
+  python3,
 }:
 
 buildNpmPackage rec {
@@ -21,13 +21,12 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-+ptjsz2MDIB/aqu4UxkBLCcehtamFdmswNUsHs23LuE=";
 
-  nativeBuildInputs = [ pkg-config python3 ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
-    libsecret
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin; [
-    Security
-    apple_sdk.frameworks.AppKit
-  ]);
+  nativeBuildInputs = [
+    pkg-config
+    python3
+  ];
+  buildInputs =
+    lib.optionals stdenv.hostPlatform.isLinux [ libsecret ];
 
   meta = {
     description = "An open source Azure Storage API compatible server";

pkgs/by-name/bi/binsider/package.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  darwin,
   rustPlatform,
   fetchFromGitHub,
   stdenv,
@@ -20,14 +19,6 @@ rustPlatform.buildRustPackage rec {
 
   buildNoDefaultFeatures = !stdenv.isLinux;
 
-  buildInputs = lib.optionals stdenv.isDarwin (
-    with darwin.apple_sdk.frameworks;
-    [
-      AppKit
-      CoreServices
-    ]
-  );
-
   checkType = "debug";
   checkFlags = [
     "--skip=test_extract_strings"

pkgs/by-name/br/browsers/package.nix

@@ -10,8 +10,6 @@
   glib,
   gtk3,
   pango,
-  stdenv,
-  darwin,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -38,21 +36,14 @@ rustPlatform.buildRustPackage rec {
     wrapGAppsHook3
   ];
 
-  buildInputs =
-    [
-      atk
-      cairo
-      gdk-pixbuf
-      glib
-      gtk3
-      pango
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.AppKit
-      darwin.apple_sdk.frameworks.CoreGraphics
-      darwin.apple_sdk.frameworks.CoreText
-      darwin.apple_sdk.frameworks.Foundation
-    ];
+  buildInputs = [
+    atk
+    cairo
+    gdk-pixbuf
+    glib
+    gtk3
+    pango
+  ];
 
   postInstall = ''
     install -m 444 \

pkgs/by-name/bu/bunbun/package.nix

@@ -2,8 +2,6 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  stdenv,
-  darwin,
   versionCheckHook,
   nix-update-script,
 }:
@@ -21,18 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-UEUK8GBkyzUv2J6uTjRdyoIiHVKLDYYj1aOnl+rgzmk=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
-    with darwin.apple_sdk.frameworks;
-    [
-      CoreFoundation
-      IOKit
-      SystemConfiguration
-    ]
-  );
-
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = [ "--version" ];
   doInstallCheck = true;
 

pkgs/by-name/c2/c2patool/package.nix

@@ -1,12 +1,12 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, rustPlatform
-, libiconv
-, darwin
-, openssl
-, pkg-config
-, git
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  libiconv,
+  openssl,
+  pkg-config,
+  git,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "c2patool";
@@ -28,13 +28,8 @@ rustPlatform.buildRustPackage rec {
     git
     pkg-config
   ];
-  buildInputs = [
-    openssl
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin [
-    libiconv
-    darwin.apple_sdk.frameworks.CoreServices
-    darwin.apple_sdk.frameworks.Carbon
-  ];
+
+  buildInputs = [ openssl ];
 
   checkFlags = [
     # These tests rely on additional executables to be compiled to "target/debug/".
@@ -59,7 +54,10 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Command line tool for displaying and adding C2PA manifests";
     homepage = "https://github.com/contentauth/c2patool";
-    license = with licenses; [ asl20 /* or */ mit ];
+    license = with licenses; [
+      asl20 # or
+      mit
+    ];
     maintainers = with maintainers; [ ok-nick ];
     mainProgram = "c2patool";
   };