From 36b135ce9a7ca0d29924f8656257448aef428ae4 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 2 Jan 2025 19:20:02 -0600 Subject: [PATCH] treewide: unpin apple-sdk_11 --- pkgs/applications/audio/musescore/default.nix | 4 -- pkgs/applications/editors/lapce/default.nix | 2 - pkgs/applications/emulators/86box/default.nix | 4 +- .../networking/sync/lsyncd/default.nix | 6 +-- .../version-management/fnc/default.nix | 4 -- .../version-management/gitoxide/default.nix | 3 +- .../build-graalvm-native-image/default.nix | 9 ---- .../by-name/ag/age-plugin-yubikey/package.nix | 10 ++-- pkgs/by-name/al/alacritty/package.nix | 7 +-- pkgs/by-name/an/anvil-editor/package.nix | 29 ++++------- pkgs/by-name/ar/ares/package.nix | 4 -- pkgs/by-name/au/audacity/package.nix | 2 - pkgs/by-name/au/augustus/package.nix | 3 +- pkgs/by-name/bo/bottom/package.nix | 6 --- pkgs/by-name/br/bruno-cli/package.nix | 13 ++--- pkgs/by-name/br/bruno/package.nix | 16 ++---- pkgs/by-name/bs/bsnes-hd/package.nix | 5 +- pkgs/by-name/ca/cargo-deadlinks/package.nix | 3 -- pkgs/by-name/ca/cargo-spellcheck/package.nix | 4 -- pkgs/by-name/ch/chrony/package.nix | 6 --- pkgs/by-name/co/contour/package.nix | 2 - pkgs/by-name/co/corsix-th/package.nix | 6 +-- pkgs/by-name/da/darkradiant/package.nix | 40 +++++++-------- pkgs/by-name/de/debase/package.nix | 3 +- pkgs/by-name/de/dexed/package.nix | 23 ++++----- pkgs/by-name/ed/edencommon/package.nix | 25 ++++----- pkgs/by-name/en/en-croissant/package.nix | 21 ++++---- pkgs/by-name/es/espanso/package.nix | 6 --- pkgs/by-name/fb/fb303/package.nix | 23 +++------ pkgs/by-name/fb/fbthrift/package.nix | 29 ++++------- pkgs/by-name/fe/febio-studio/package.nix | 8 +-- pkgs/by-name/fe/febio/package.nix | 10 +--- pkgs/by-name/fi/findup/package.nix | 3 -- pkgs/by-name/fi/fire/package.nix | 21 ++++---- pkgs/by-name/fi/fizz/package.nix | 23 +++------ pkgs/by-name/fo/folly/package.nix | 37 ++++++-------- pkgs/by-name/gc/gcs/package.nix | 4 -- pkgs/by-name/gg/gg-jj/package.nix | 4 +- pkgs/by-name/gh/ghc_filesystem/package.nix | 3 -- .../git-interactive-rebase-tool/package.nix | 2 - pkgs/by-name/gl/glsl_analyzer/package.nix | 7 --- pkgs/by-name/ja/jankyborders/package.nix | 5 -- pkgs/by-name/je/jellyfin-web/package.nix | 8 +-- pkgs/by-name/ju/julius/package.nix | 3 +- pkgs/by-name/ka/kando/package.nix | 19 +++---- pkgs/by-name/li/linuxwave/package.nix | 3 -- pkgs/by-name/ln/lnav/package.nix | 4 -- pkgs/by-name/ls/lsd/package.nix | 4 -- pkgs/by-name/ma/materialize/package.nix | 16 ++---- pkgs/by-name/mi/minizign/package.nix | 3 -- .../mo/modrinth-app-unwrapped/package.nix | 6 +-- pkgs/by-name/mo/moonlight-qt/package.nix | 4 -- pkgs/by-name/mv/mvfst/package.nix | 17 ++----- pkgs/by-name/nc/ncspot/package.nix | 2 - pkgs/by-name/ne/neovide/package.nix | 3 +- pkgs/by-name/nt/ntpd-rs/package.nix | 3 -- pkgs/by-name/nu/nufmt/package.nix | 6 --- pkgs/by-name/nv/nvc/package.nix | 4 -- pkgs/by-name/op/openvi/package.nix | 3 +- pkgs/by-name/pa/packetry/package.nix | 14 ++--- pkgs/by-name/pi/pizauth/package.nix | 5 -- .../pr/prismlauncher-unwrapped/package.nix | 22 ++++---- pkgs/by-name/pu/pugl/package.nix | 25 ++++----- pkgs/by-name/qb/qbittorrent/package.nix | 2 - pkgs/by-name/rb/rbw/package.nix | 11 +--- pkgs/by-name/rc/rcodesign/package.nix | 3 -- pkgs/by-name/re/rehex/package.nix | 4 +- pkgs/by-name/re/rerun/package.nix | 24 +++------ pkgs/by-name/re/rewatch/package.nix | 6 --- pkgs/by-name/ri/ride/package.nix | 3 -- pkgs/by-name/ri/rio/package.nix | 2 - pkgs/by-name/ri/ripgrep/package.nix | 5 +- pkgs/by-name/ru/rucola/package.nix | 13 ++--- pkgs/by-name/sc/scopehal-apps/package.nix | 4 -- pkgs/by-name/sh/shipwright/package.nix | 4 +- .../by-name/si/signalbackup-tools/package.nix | 34 ++++++------- pkgs/by-name/sk/skhd/package.nix | 7 --- pkgs/by-name/sk/skia/package.nix | 5 +- .../sp/spicy-parser-generator/package.nix | 13 ++--- pkgs/by-name/sp/spotify-player/package.nix | 4 -- pkgs/by-name/st/stockfish/package.nix | 9 ---- pkgs/by-name/ta/taterclient-ddnet/package.nix | 1 - pkgs/by-name/td/tdb/package.nix | 51 ++++++++++--------- pkgs/by-name/te/tealdeer/package.nix | 4 -- pkgs/by-name/to/ton/package.nix | 28 ++++------ pkgs/by-name/tu/turbo-unwrapped/package.nix | 3 +- pkgs/by-name/vc/vcpkg-tool/package.nix | 3 +- pkgs/by-name/vi/vimv-rs/package.nix | 4 -- pkgs/by-name/wa/wangle/package.nix | 25 ++++----- pkgs/by-name/wa/watchman/package.nix | 35 +++++-------- pkgs/by-name/ws/wstunnel/package.nix | 6 --- pkgs/by-name/zl/zls/package.nix | 3 -- pkgs/by-name/zo/zon2nix/package.nix | 3 -- pkgs/by-name/zt/ztags/package.nix | 3 -- pkgs/development/compilers/go/1.22.nix | 2 - pkgs/development/compilers/go/1.23.nix | 2 - pkgs/development/compilers/go/1.24.nix | 2 - .../community-edition/buildGraalvm.nix | 28 ++++------ pkgs/development/libraries/ngtcp2/default.nix | 26 ++++++---- .../llama-cpp-python/default.nix | 23 +++------ .../python-modules/nanobind/default.nix | 9 ---- .../python-modules/soxr/default.nix | 10 +--- .../python-modules/wandb/default.nix | 3 -- .../python-modules/watchdog/default.nix | 3 -- pkgs/games/ddnet/default.nix | 4 -- pkgs/servers/search/meilisearch/default.nix | 4 -- pkgs/tools/system/btop/default.nix | 2 - 107 files changed, 308 insertions(+), 751 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 4a06c49e49ef0b..04253607aadb16 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -32,7 +32,6 @@ qtnetworkauth, qttools, nixosTests, - apple-sdk_11, }: stdenv.mkDerivation (finalAttrs: { @@ -127,9 +126,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib qtwayland - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 ]; postInstall = diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index ea649595d64505..83a76824e4052a 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -19,7 +19,6 @@ wayland, gobject-introspection, xorg, - apple-sdk_11, }: let rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [ @@ -94,7 +93,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - apple-sdk_11 ]; postInstall = diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix index f9c25f94a4ba75..51961cc76e5a5b 100644 --- a/pkgs/applications/emulators/86box/default.nix +++ b/pkgs/applications/emulators/86box/default.nix @@ -1,6 +1,5 @@ { stdenv, - apple-sdk_11, lib, fetchFromGitHub, cmake, @@ -90,8 +89,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optional enableWayland wayland - ++ lib.optional enableVncRenderer libvncserver - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + ++ lib.optional enableVncRenderer libvncserver; cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 7a985b7ad94023..c11e062e33e0e4 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -11,11 +11,11 @@ docbook_xml_dtd_45, docbook_xsl, libxslt, - apple-sdk_11, + apple-sdk, }: let - xnu = apple-sdk_11.sourceRelease "xnu"; + xnu = apple-sdk.sourceRelease "xnu"; in stdenv.mkDerivation rec { pname = "lsyncd"; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_45 docbook_xsl libxslt - ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + ]; meta = with lib; { homepage = "https://github.com/axkibe/lsyncd"; diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index af9088d8a068e4..515f8a193311ac 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -5,8 +5,6 @@ zlib, ncurses, libiconv, - apple-sdk_11, - darwinMinVersionHook, }: stdenv.mkDerivation (finalAttrs: { @@ -22,8 +20,6 @@ stdenv.mkDerivation (finalAttrs: { libiconv ncurses zlib - apple-sdk_11 - (darwinMinVersionHook "11.0") ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 61b8cfdf68c5eb..87bc03fb54e7ec 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -5,7 +5,6 @@ cmake, pkg-config, stdenv, - apple-sdk_11, curl, openssl, buildPackages, @@ -36,7 +35,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin then [ apple-sdk_11 ] else [ openssl ]); + buildInputs = [ curl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; preFixup = lib.optionalString canRunCmd '' installShellCompletion --cmd gix \ diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index 45680a42e9ed9e..e1e4df52f02aea 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, - apple-sdk_11, - darwinMinVersionHook, glibcLocales, # The GraalVM derivation to use graalvmDrv, @@ -35,8 +33,6 @@ let extraArgs = builtins.removeAttrs args [ "lib" "stdenv" - "apple-sdk_11" - "darwinMinVersionHook" "glibcLocales" "jar" "dontUnpack" @@ -60,11 +56,6 @@ stdenv.mkDerivation ( removeReferencesTo ]; - buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; - nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ]; buildPhase = diff --git a/pkgs/by-name/ag/age-plugin-yubikey/package.nix b/pkgs/by-name/ag/age-plugin-yubikey/package.nix index 4c0446e586fd49..986e7b0a31e127 100644 --- a/pkgs/by-name/ag/age-plugin-yubikey/package.nix +++ b/pkgs/by-name/ag/age-plugin-yubikey/package.nix @@ -6,7 +6,6 @@ pkg-config, openssl, pcsclite, - apple-sdk_11, }: rustPlatform.buildRustPackage rec { @@ -31,12 +30,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]; meta = with lib; { description = "YubiKey plugin for age"; diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index 5376c79a407280..508d26bace0be9 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -22,7 +22,6 @@ wayland, xdg-utils, - apple-sdk_11, }: let rpathLibs = @@ -65,11 +64,7 @@ rustPlatform.buildRustPackage rec { scdoc ]; - buildInputs = - rpathLibs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; + buildInputs = rpathLibs; outputs = [ "out" diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix index 97a547f25bb02b..af00f9f5083ebe 100644 --- a/pkgs/by-name/an/anvil-editor/package.nix +++ b/pkgs/by-name/an/anvil-editor/package.nix @@ -4,12 +4,9 @@ buildGoModule, fetchzip, pkg-config, - libicns, copyDesktopItems, makeDesktopItem, desktopToDarwinBundle, - apple-sdk_11, - darwinMinVersionHook, wayland, libxkbcommon, vulkan-headers, @@ -44,23 +41,15 @@ buildGoModule rec { desktopToDarwinBundle ]; - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ - apple-sdk_11 - # metal dependencies require 10.13 or newer - (darwinMinVersionHook "10.13") - ] - else - [ - wayland - libxkbcommon - vulkan-headers - libGL - xorg.libX11 - xorg.libXcursor - xorg.libXfixes - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + wayland + libxkbcommon + vulkan-headers + libGL + xorg.libX11 + xorg.libXcursor + xorg.libXfixes + ]; # Got different result in utf8 char length? checkFlags = [ "-skip=^TestClearAfter$" ]; diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index 6af1cb6d4e5040..5e24c6d8f8fdad 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -2,7 +2,6 @@ lib, SDL2, alsa-lib, - apple-sdk_11, autoPatchelfHook, fetchFromGitHub, gtk3, @@ -67,9 +66,6 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio openal udev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 ]; appendRunpaths = [ (lib.makeLibraryPath [ vulkan-loader ]) ]; diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index e68a8bcf111b8b..061aea770cdade 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -52,7 +52,6 @@ wavpack, wxGTK32, gtk3, - apple-sdk_11, libpng, libjpeg, }: @@ -144,7 +143,6 @@ stdenv.mkDerivation (finalAttrs: { util-linux ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 libpng libjpeg ]; diff --git a/pkgs/by-name/au/augustus/package.nix b/pkgs/by-name/au/augustus/package.nix index c2b116f269f263..e2aa70b1694fa1 100644 --- a/pkgs/by-name/au/augustus/package.nix +++ b/pkgs/by-name/au/augustus/package.nix @@ -7,7 +7,6 @@ SDL2_mixer, libpng, darwin, - apple-sdk_11, libicns, imagemagick, }: @@ -37,7 +36,7 @@ stdenv.mkDerivation rec { SDL2 SDL2_mixer libpng - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + ]; installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix index 33b91c6db5d235..9a19a12e500fe6 100644 --- a/pkgs/by-name/bo/bottom/package.nix +++ b/pkgs/by-name/bo/bottom/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, autoAddDriverRunpath, installShellFiles, - stdenv, - apple-sdk_11, versionCheckHook, nix-update-script, }: @@ -28,10 +26,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; - postInstall = '' installManPage target/tmp/bottom/manpage/btm.1 installShellCompletion \ diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix index 51d771e9a3eb7b..c5203edbfe3a41 100644 --- a/pkgs/by-name/br/bruno-cli/package.nix +++ b/pkgs/by-name/br/bruno-cli/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, buildNpmPackage, bruno, pkg-config, pango, - apple-sdk_11, testers, bruno-cli, }: @@ -28,14 +26,9 @@ buildNpmPackage { pkg-config ]; - buildInputs = - [ - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # fix for: https://github.com/NixOS/nixpkgs/issues/272156 - apple-sdk_11 - ]; + buildInputs = [ + pango + ]; ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index e6ffdea18a3524..7de25e8cd9c587 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -13,7 +13,6 @@ cairo, pango, npm-lockfile-fix, - apple-sdk_11, }: buildNpmPackage rec { @@ -43,16 +42,11 @@ buildNpmPackage rec { copyDesktopItems ]; - buildInputs = - [ - pixman - cairo - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # fix for: https://github.com/NixOS/nixpkgs/issues/272156 - apple-sdk_11 - ]; + buildInputs = [ + pixman + cairo + pango + ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/by-name/bs/bsnes-hd/package.nix b/pkgs/by-name/bs/bsnes-hd/package.nix index bc03d6bbce0300..c98b96e2affb85 100644 --- a/pkgs/by-name/bs/bsnes-hd/package.nix +++ b/pkgs/by-name/bs/bsnes-hd/package.nix @@ -2,9 +2,7 @@ lib, SDL2, alsa-lib, - apple-sdk_11, fetchFromGitHub, - fetchpatch, gtk3, gtksourceview3, libX11, @@ -69,8 +67,7 @@ stdenv.mkDerivation { alsa-lib openal libpulseaudio - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + ]; makeFlags = [ diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix index e461c80cd04bcb..67dda48c1ad5ef 100644 --- a/pkgs/by-name/ca/cargo-deadlinks/package.nix +++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - apple-sdk_11, }: rustPlatform.buildRustPackage rec { @@ -31,8 +30,6 @@ rustPlatform.buildRustPackage rec { # assumes the target is x86_64-unknown-linux-gnu "--skip simple_project::it_checks_okay_project_correctly"; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - meta = with lib; { description = "Cargo subcommand to check rust documentation for broken links"; homepage = "https://github.com/deadlinks/cargo-deadlinks"; diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix index f33a0f385b67a5..c79eefb5086a03 100644 --- a/pkgs/by-name/ca/cargo-spellcheck/package.nix +++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - apple-sdk_11, }: rustPlatform.buildRustPackage rec { @@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - preCheck = "HOME=$(mktemp -d)"; checkFlags = [ diff --git a/pkgs/by-name/ch/chrony/package.nix b/pkgs/by-name/ch/chrony/package.nix index 22eaf9a13bc53b..cfa7806285f38c 100644 --- a/pkgs/by-name/ch/chrony/package.nix +++ b/pkgs/by-name/ch/chrony/package.nix @@ -10,8 +10,6 @@ libseccomp, pps-tools, nixosTests, - apple-sdk_11, - darwinMinVersionHook, }: stdenv.mkDerivation rec { @@ -40,10 +38,6 @@ stdenv.mkDerivation rec { libcap libseccomp pps-tools - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "10.13") ]; configureFlags = [ diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix index 03f09fab40255a..779144322f25e6 100644 --- a/pkgs/by-name/co/contour/package.nix +++ b/pkgs/by-name/co/contour/package.nix @@ -20,7 +20,6 @@ yaml-cpp, ncurses, file, - apple-sdk_11, libutil, sigtool, nixosTests, @@ -73,7 +72,6 @@ stdenv.mkDerivation (final: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 libutil ]; diff --git a/pkgs/by-name/co/corsix-th/package.nix b/pkgs/by-name/co/corsix-th/package.nix index 9d6a78b361a442..6ae3ea1090139c 100644 --- a/pkgs/by-name/co/corsix-th/package.nix +++ b/pkgs/by-name/co/corsix-th/package.nix @@ -12,9 +12,6 @@ SDL2, SDL2_mixer, timidity, - # Darwin dependencies - libiconv, - apple-sdk_11, # Update nix-update-script, }: @@ -60,8 +57,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_mixer timidity - ] - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + ]; cmakeFlags = [ "-Wno-dev" ]; diff --git a/pkgs/by-name/da/darkradiant/package.nix b/pkgs/by-name/da/darkradiant/package.nix index 87e1e2d0ad6dd3..7c309d86655ed8 100644 --- a/pkgs/by-name/da/darkradiant/package.nix +++ b/pkgs/by-name/da/darkradiant/package.nix @@ -21,7 +21,6 @@ python3, asciidoctor, libgit2, - apple-sdk_11, wrapGAppsHook3, installShellFiles, buildPlugins ? true, @@ -46,28 +45,23 @@ stdenv.mkDerivation (finalAttrs: { installShellFiles ]; - buildInputs = - [ - zlib - libjpeg - wxGTK32 - libxml2 - libsigcxx - libpng - openal - libvorbis - eigen - ftgl - freetype - glew - glib - libgit2 - python3 - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; + buildInputs = [ + zlib + libjpeg + wxGTK32 + libxml2 + libsigcxx + libpng + openal + libvorbis + eigen + ftgl + freetype + glew + glib + libgit2 + python3 + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]; doCheck = true; diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix index 70be9b81eed637..c32b5423f1eda1 100644 --- a/pkgs/by-name/de/debase/package.nix +++ b/pkgs/by-name/de/debase/package.nix @@ -1,5 +1,4 @@ { - apple-sdk_11, fetchFromGitHub, fetchpatch, # Delete at next version bump. lib, @@ -53,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgit2 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/de/dexed/package.nix b/pkgs/by-name/de/dexed/package.nix index 0e2479517cfe5f..95eb94b1af1a42 100644 --- a/pkgs/by-name/de/dexed/package.nix +++ b/pkgs/by-name/de/dexed/package.nix @@ -13,7 +13,6 @@ freetype, alsa-lib, libjack2, - apple-sdk_11, }: stdenv.mkDerivation (finalAttrs: { @@ -49,18 +48,16 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - libX11 - libXext - libXcursor - libXinerama - libXrandr - freetype - alsa-lib - libjack2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libXext + libXcursor + libXinerama + libXrandr + freetype + alsa-lib + libjack2 + ]; # JUCE insists on only dlopen'ing these NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux (toString [ diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index 060ea7cc2da29c..871e79301580c4 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -15,8 +15,6 @@ wangle, fbthrift, gtest, - apple-sdk_11, - darwinMinVersionHook, nix-update-script, }: @@ -48,20 +46,15 @@ stdenv.mkDerivation (finalAttrs: { removeReferencesTo ]; - buildInputs = - [ - glog - gflags - folly - fb303 - wangle - fbthrift - gtest - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + glog + gflags + folly + fb303 + wangle + fbthrift + gtest + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix index 6b8ea3e50f11e2..972a9a797e0454 100644 --- a/pkgs/by-name/en/en-croissant/package.nix +++ b/pkgs/by-name/en/en-croissant/package.nix @@ -15,7 +15,6 @@ libsoup_2_4, webkitgtk_4_0, gst_all_1, - apple-sdk_11, }: rustPlatform.buildRustPackage rec { @@ -51,17 +50,15 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - libsoup_2_4 - webkitgtk_4_0 - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-good - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + libsoup_2_4 + webkitgtk_4_0 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-good + ]; doCheck = false; # many scoring tests fail diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix index 636bec07ee1ec6..10d2f31bce2598 100644 --- a/pkgs/by-name/es/espanso/package.nix +++ b/pkgs/by-name/es/espanso/package.nix @@ -19,8 +19,6 @@ wxGTK32, makeWrapper, stdenv, - apple-sdk_11, - darwinMinVersionHook, waylandSupport ? false, x11Support ? stdenv.hostPlatform.isLinux, testers, @@ -81,10 +79,6 @@ rustPlatform.buildRustPackage rec { libnotify libxkbcommon ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "10.13") - ] ++ lib.optionals waylandSupport [ wl-clipboard ] diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index b03e66eb861ca9..97e7dbe5f8a4d2 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -13,8 +13,6 @@ fbthrift, fizz, wangle, - apple-sdk_11, - darwinMinVersionHook, nix-update-script, }: @@ -40,19 +38,14 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; - buildInputs = - [ - gflags - glog - folly - fbthrift - fizz - wangle - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + gflags + glog + folly + fbthrift + fizz + wangle + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index a189e7a66a933a..92fcb3636b3629 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -17,8 +17,6 @@ zlib, zstd, xxHash, - apple-sdk_11, - darwinMinVersionHook, mvfst, @@ -56,22 +54,17 @@ stdenv.mkDerivation (finalAttrs: { removeReferencesTo ]; - buildInputs = - [ - openssl - gflags - glog - folly - fizz - wangle - zlib - zstd - xxHash - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + openssl + gflags + glog + folly + fizz + wangle + zlib + zstd + xxHash + ]; propagatedBuildInputs = [ mvfst diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix index 13271dc23e4372..aecec37c9523c6 100644 --- a/pkgs/by-name/fe/febio-studio/package.nix +++ b/pkgs/by-name/fe/febio-studio/package.nix @@ -9,8 +9,6 @@ qt6Packages, febio, glew, - apple-sdk_11, - darwinMinVersionHook, fetchpatch, sshSupport ? true, openssl, @@ -74,11 +72,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional tetgenSupport tetgen ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optional dicomSupport dcmtk - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "10.15") - ]; + ++ lib.optional dicomSupport dcmtk; meta = { description = "FEBio Suite Solver"; diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix index 698b0d81ea803d..2ee2ca5251852f 100644 --- a/pkgs/by-name/fe/febio/package.nix +++ b/pkgs/by-name/fe/febio/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, fetchpatch2, replaceVars, - apple-sdk_11, cmake, - darwinMinVersionHook, ninja, zlib, mklSupport ? true, @@ -48,13 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; - buildInputs = - [ zlib ] - ++ lib.optionals mklSupport [ mkl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "10.15") - ]; + buildInputs = [ zlib ] ++ lib.optionals mklSupport [ mkl ]; meta = { description = "FEBio Suite Solver"; diff --git a/pkgs/by-name/fi/findup/package.nix b/pkgs/by-name/fi/findup/package.nix index 645e7731b49888..baa0248200ed77 100644 --- a/pkgs/by-name/fi/findup/package.nix +++ b/pkgs/by-name/fi/findup/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, testers, zig_0_11, - apple-sdk_11, }: let zig = zig_0_11; @@ -22,8 +21,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ zig.hook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { diff --git a/pkgs/by-name/fi/fire/package.nix b/pkgs/by-name/fi/fire/package.nix index f8f32d05708f67..a5c3c0be3681d6 100644 --- a/pkgs/by-name/fi/fire/package.nix +++ b/pkgs/by-name/fi/fire/package.nix @@ -13,7 +13,6 @@ libXcursor, freetype, alsa-lib, - apple-sdk_11, }: stdenv.mkDerivation (finalAttrs: { @@ -53,17 +52,15 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - libX11 - libXrandr - libXinerama - libXext - libXcursor - freetype - alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libXrandr + libXinerama + libXext + libXcursor + freetype + alsa-lib + ]; cmakeFlags = [ (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 4c5c1efe08c6d2..e02f683e21e6d1 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -14,8 +14,6 @@ zstd, gflags, libevent, - apple-sdk_11, - darwinMinVersionHook, folly, libsodium, @@ -49,19 +47,14 @@ stdenv.mkDerivation (finalAttrs: { removeReferencesTo ]; - buildInputs = - [ - openssl - glog - double-conversion - zstd - gflags - libevent - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + openssl + glog + double-conversion + zstd + gflags + libevent + ]; propagatedBuildInputs = [ folly diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index ca393d884a13e7..12f8170324b197 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -21,8 +21,6 @@ zstd, libiberty, libunwind, - apple-sdk_11, - darwinMinVersionHook, boost, fmt_11, @@ -64,26 +62,21 @@ stdenv.mkDerivation (finalAttrs: { ]; # See CMake/folly-deps.cmake in the Folly source tree. - buildInputs = - [ - boost - double-conversion - fast-float - gflags - glog - libevent - zlib - openssl - xz - lz4 - zstd - libiberty - libunwind - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + boost + double-conversion + fast-float + gflags + glog + libevent + zlib + openssl + xz + lz4 + zstd + libiberty + libunwind + ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix index e6c5ee6c548622..3a1d96ed47b619 100644 --- a/pkgs/by-name/gc/gcs/package.nix +++ b/pkgs/by-name/gc/gcs/package.nix @@ -17,7 +17,6 @@ mupdf, fontconfig, freetype, - apple-sdk_11, }: buildGoModule rec { @@ -88,9 +87,6 @@ buildGoModule rec { libXxf86vm fontconfig freetype - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 ]; # flags are based on https://github.com/richardwilkes/gcs/blob/master/build.sh diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix index a2d89037f43564..37f3b7b8ab4b27 100644 --- a/pkgs/by-name/gg/gg-jj/package.nix +++ b/pkgs/by-name/gg/gg-jj/package.nix @@ -17,7 +17,6 @@ openssl, webkitgtk_4_1, - apple-sdk_11, versionCheckHook, nix-update-script, @@ -71,8 +70,7 @@ stdenv.mkDerivation (finalAttrs: { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ webkitgtk_4_1 - ] - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + ]; env.OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/gh/ghc_filesystem/package.nix b/pkgs/by-name/gh/ghc_filesystem/package.nix index ff9d9c351d8fa0..dcc66bfeb3dc9d 100644 --- a/pkgs/by-name/gh/ghc_filesystem/package.nix +++ b/pkgs/by-name/gh/ghc_filesystem/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - apple-sdk_11, cmake, fetchFromGitHub, nix-update-script, @@ -20,8 +19,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix index 534db5bfb1b565..06224cfc08127f 100644 --- a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix +++ b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, rustPlatform, libiconv, - apple-sdk_11, }: rustPlatform.buildRustPackage rec { @@ -22,7 +21,6 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - apple-sdk_11 ]; # Compilation during tests fails if this env var is not set. diff --git a/pkgs/by-name/gl/glsl_analyzer/package.nix b/pkgs/by-name/gl/glsl_analyzer/package.nix index f7a71c4398a4c4..96e83519325ea4 100644 --- a/pkgs/by-name/gl/glsl_analyzer/package.nix +++ b/pkgs/by-name/gl/glsl_analyzer/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, zig_0_13, - apple-sdk_11, }: stdenv.mkDerivation (finalAttrs: { @@ -21,12 +20,6 @@ stdenv.mkDerivation (finalAttrs: { zig_0_13.hook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - # The package failed to build on x86_64-darwin because the default was the 10.12 SDK - # Once the default on all platforms has been raised to the 11.0 SDK or higher, this can be removed. - apple-sdk_11 - ]; - postPatch = '' substituteInPlace build.zig \ --replace-fail 'b.run(&.{ "git", "describe", "--tags", "--always" })' '"${finalAttrs.src.rev}"' diff --git a/pkgs/by-name/ja/jankyborders/package.nix b/pkgs/by-name/ja/jankyborders/package.nix index f1ed9b0d2292f7..b0d8a1a731e066 100644 --- a/pkgs/by-name/ja/jankyborders/package.nix +++ b/pkgs/by-name/ja/jankyborders/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - apple-sdk_11, fetchFromGitHub, pkg-config, testers, @@ -22,10 +21,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = [ - apple-sdk_11 - ]; - installPhase = '' runHook preInstall diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index a8fc62c3378044..6d57a0be863432 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -9,8 +9,6 @@ xcbuild, pango, giflib, - apple-sdk_11, - darwinMinVersionHook, jellyfin, }: buildNpmPackage rec { @@ -26,7 +24,7 @@ buildNpmPackage rec { hash = "sha256-xmy2cr6MJSen6Pok3Wde4mBcu5pM4qtGEBfqMpGdAxY="; }; - nodejs = nodejs_20; # does not build with 22 + nodejs = nodejs_20; # does not build with 22 postPatch = '' substituteInPlace webpack.common.js \ @@ -48,10 +46,6 @@ buildNpmPackage rec { [ pango ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ giflib - apple-sdk_11 - # node-canvas builds code that requires aligned_alloc, - # which on Darwin requires at least the 10.15 SDK - (darwinMinVersionHook "10.15") ]; installPhase = '' diff --git a/pkgs/by-name/ju/julius/package.nix b/pkgs/by-name/ju/julius/package.nix index 429d34420baad2..2d9cec42ba95e6 100644 --- a/pkgs/by-name/ju/julius/package.nix +++ b/pkgs/by-name/ju/julius/package.nix @@ -7,7 +7,6 @@ cmake, libpng, darwin, - apple-sdk_11, libicns, imagemagick, }: @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { SDL2 SDL2_mixer libpng - ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + ]; installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix index 8c14284c2bef8f..33244e11a37b8f 100644 --- a/pkgs/by-name/ka/kando/package.nix +++ b/pkgs/by-name/ka/kando/package.nix @@ -19,7 +19,6 @@ libXtst, libXi, wayland, - apple-sdk_11, }: buildNpmPackage rec { @@ -50,17 +49,13 @@ buildNpmPackage rec { copyDesktopItems ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - libxkbcommon - libX11 - libXtst - libXi - wayland - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libxkbcommon + libX11 + libXtst + libXi + wayland + ]; dontUseCmakeConfigure = true; diff --git a/pkgs/by-name/li/linuxwave/package.nix b/pkgs/by-name/li/linuxwave/package.nix index e9ec5ad93687e2..41a5819ac1a7ab 100644 --- a/pkgs/by-name/li/linuxwave/package.nix +++ b/pkgs/by-name/li/linuxwave/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, zig_0_13, - apple-sdk_11, callPackage, }: @@ -32,8 +31,6 @@ stdenv.mkDerivation (finalAttrs: { zig.hook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - postInstall = '' installManPage man/linuxwave.1 ''; diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix index 1cbe887b1f0716..2d2378e9df5b3b 100644 --- a/pkgs/by-name/ln/lnav/package.nix +++ b/pkgs/by-name/ln/lnav/package.nix @@ -19,7 +19,6 @@ cargo, rustPlatform, rustc, - apple-sdk_11, }: stdenv.mkDerivation rec { @@ -58,9 +57,6 @@ stdenv.mkDerivation rec { curl libarchive ] - ++ lib.optionals stdenv.isDarwin [ - apple-sdk_11 - ] ++ lib.optionals (!stdenv.isDarwin) [ gpm ]; diff --git a/pkgs/by-name/ls/lsd/package.nix b/pkgs/by-name/ls/lsd/package.nix index 98c2e8dfc8b12f..e2b4bb682e635f 100644 --- a/pkgs/by-name/ls/lsd/package.nix +++ b/pkgs/by-name/ls/lsd/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, installShellFiles, - apple-sdk_11, pandoc, testers, lsd, @@ -28,8 +26,6 @@ rustPlatform.buildRustPackage rec { pandoc ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - postInstall = '' pandoc --standalone --to man doc/lsd.md -o lsd.1 installManPage lsd.1 diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix index c3745ba58f4754..5e575efb2afd62 100644 --- a/pkgs/by-name/ma/materialize/package.nix +++ b/pkgs/by-name/ma/materialize/package.nix @@ -15,8 +15,6 @@ # buildInputs openssl, rdkafka, - apple-sdk_11, - darwinMinVersionHook, versionCheckHook, nix-update-script, @@ -138,16 +136,10 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; - buildInputs = - [ - openssl - rdkafka - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer - apple-sdk_11 - (darwinMinVersionHook "10.13") - ]; + buildInputs = [ + openssl + rdkafka + ]; # the check phase requires linking with rocksdb which can be a problem since # the rust rocksdb crate is not updated very often. diff --git a/pkgs/by-name/mi/minizign/package.nix b/pkgs/by-name/mi/minizign/package.nix index a5dfa15ba17fa3..ea85e75a53292a 100644 --- a/pkgs/by-name/mi/minizign/package.nix +++ b/pkgs/by-name/mi/minizign/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, zig_0_13, - apple-sdk_11, }: let @@ -24,8 +23,6 @@ stdenv.mkDerivation (finalAttrs: { zig.hook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - meta = { description = "Minisign reimplemented in Zig"; homepage = "https://github.com/jedisct1/zig-minisign"; diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 695d42ca6ea0ed..1323ac457f59cf 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - apple-sdk_11, cacert, cargo-tauri, desktop-file-utils, @@ -48,10 +47,7 @@ rustPlatform.buildRustPackage rec { pnpm.configHook ] ++ lib.optional stdenv.hostPlatform.isDarwin makeBinaryWrapper; - buildInputs = - [ openssl ] - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11 - ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1; # Tests fail on other, unrelated packages in the monorepo cargoTestFlags = [ diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix index 323f79d0160cec..dc57ce4678f59b 100644 --- a/pkgs/by-name/mo/moonlight-qt/package.nix +++ b/pkgs/by-name/mo/moonlight-qt/package.nix @@ -19,7 +19,6 @@ libxkbcommon, wayland, libdrm, - apple-sdk_11, nix-update-script, }: @@ -70,9 +69,6 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtwayland wayland libdrm - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 ]; qmakeFlags = [ "CONFIG+=disable-prebuilts" ]; diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index de686a269b5117..f14b252cf74573 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -11,8 +11,6 @@ folly, gflags, glog, - apple-sdk_11, - darwinMinVersionHook, fizz, @@ -44,16 +42,11 @@ stdenv.mkDerivation (finalAttrs: { removeReferencesTo ]; - buildInputs = - [ - folly - gflags - glog - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + folly + gflags + glog + ]; propagatedBuildInputs = [ fizz diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix index 9a3383f287759a..46d346176116bd 100644 --- a/pkgs/by-name/nc/ncspot/package.nix +++ b/pkgs/by-name/nc/ncspot/package.nix @@ -2,7 +2,6 @@ lib, stdenv, alsa-lib, - apple-sdk_11, config, dbus, fetchFromGitHub, @@ -50,7 +49,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses ] - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11 ++ lib.optional stdenv.hostPlatform.isLinux openssl ++ lib.optional (withALSA || withRodio) alsa-lib ++ lib.optional withClipboard libxcb diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index f8a33a9a4597b9..7fead8ea25a027 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -13,7 +13,6 @@ pkg-config, python3, removeReferencesTo, - apple-sdk_11, cctools, SDL2, fontconfig, @@ -81,7 +80,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { SDL2 fontconfig rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + ]; postFixup = let diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix index 87aea07c6e9878..90f2385dccc7db 100644 --- a/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/pkgs/by-name/nt/ntpd-rs/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - apple-sdk_11, ntpd-rs, installShellFiles, pandoc, @@ -25,8 +24,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ZB18YbCdJpuu7qTXdHgs2IgDCoc3Hs/aDn4dzXmKI8c="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - nativeBuildInputs = [ pandoc installShellFiles diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index 8c956cb8208095..adba5f328ec3c5 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - apple-sdk_11, nix-update-script, }: @@ -22,10 +20,6 @@ rustPlatform.buildRustPackage { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; - cargoHash = "sha256-MHZlXmHAYIiaB6Isutqjrh45jppRzTZRSE3VqzpFBBA="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix index 1afeaf9673d948..64927c674a900f 100644 --- a/pkgs/by-name/nv/nvc/package.nix +++ b/pkgs/by-name/nv/nvc/package.nix @@ -12,7 +12,6 @@ llvm, zlib, zstd, - apple-sdk_11, }: stdenv.mkDerivation rec { @@ -43,9 +42,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 ]; preConfigure = '' diff --git a/pkgs/by-name/op/openvi/package.nix b/pkgs/by-name/op/openvi/package.nix index 6b88bdd2966737..9ac54feb90b759 100644 --- a/pkgs/by-name/op/openvi/package.nix +++ b/pkgs/by-name/op/openvi/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, ncurses, perl, - apple-sdk_11, }: stdenv.mkDerivation rec { @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses perl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + ]; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix index 42e5f062faeb59..78bfd1b43b0c50 100644 --- a/pkgs/by-name/pa/packetry/package.nix +++ b/pkgs/by-name/pa/packetry/package.nix @@ -1,13 +1,11 @@ { fetchFromGitHub, lib, - stdenv, rustPlatform, gtk4, pkg-config, pango, wrapGAppsHook4, - apple-sdk_11, versionCheckHook, }: @@ -29,14 +27,10 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook4 ]; - buildInputs = - [ - gtk4 - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; + buildInputs = [ + gtk4 + pango + ]; # Disable test_replay tests as they need a gui preCheck = '' diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix index 517a38571bed9d..17333ca1194367 100644 --- a/pkgs/by-name/pi/pizauth/package.nix +++ b/pkgs/by-name/pi/pizauth/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - apple-sdk_11, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -20,9 +18,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-moRr8usrFHE8YPQnsmeKoDZPAk94qRm9cHzHBLXtGFM="; - # pizauth cannot be built with default apple-sdk_10 on x86_64-darwin, pin to 11 - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index dffc73ff16d6cc..a43ff52601c965 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, cmark, - apple-sdk_11, extra-cmake-modules, gamemode, ghc_filesystem, @@ -57,18 +56,15 @@ stdenv.mkDerivation (finalAttrs: { stripJavaArchivesHook ]; - buildInputs = - [ - cmark - ghc_filesystem - kdePackages.qtbase - kdePackages.qtnetworkauth - kdePackages.quazip - tomlplusplus - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ] - ++ lib.optional gamemodeSupport gamemode; + buildInputs = [ + cmark + ghc_filesystem + kdePackages.qtbase + kdePackages.qtnetworkauth + kdePackages.quazip + tomlplusplus + zlib + ] ++ lib.optional gamemodeSupport gamemode; hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ]; diff --git a/pkgs/by-name/pu/pugl/package.nix b/pkgs/by-name/pu/pugl/package.nix index 4887bcad63eb31..2af38bb31d1b6d 100644 --- a/pkgs/by-name/pu/pugl/package.nix +++ b/pkgs/by-name/pu/pugl/package.nix @@ -15,7 +15,6 @@ sphinx, sphinxygen, ninja, - apple-sdk_11, }: stdenv.mkDerivation (finalAttrs: { @@ -45,20 +44,16 @@ stdenv.mkDerivation (finalAttrs: { python3.pkgs.sphinx-lv2-theme ]; - buildInputs = - [ - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - libGL - vulkan-loader - vulkan-headers - xorg.libXext - cairo - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; + buildInputs = [ + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + libGL + vulkan-loader + vulkan-headers + xorg.libXext + cairo + ]; meta = { homepage = "https://github.com/lv2/pugl"; diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix index d468554240c518..b14db25ef91d3a 100644 --- a/pkgs/by-name/qb/qbittorrent/package.nix +++ b/pkgs/by-name/qb/qbittorrent/package.nix @@ -1,5 +1,4 @@ { - apple-sdk_11, boost, cmake, dbus, @@ -47,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: { qt6.qttools zlib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ] ++ lib.optionals guiSupport [ dbus ] ++ lib.optionals (guiSupport && stdenv.hostPlatform.isLinux) [ qt6.qtwayland ] ++ lib.optionals trackerSearch [ python3 ]; diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix index 7e3776be7575a0..6e032f6552b92c 100644 --- a/pkgs/by-name/rb/rbw/package.nix +++ b/pkgs/by-name/rb/rbw/package.nix @@ -6,9 +6,7 @@ openssl, pkg-config, installShellFiles, - darwin, bash, - apple-sdk_11, # rbw-fzf withFzf ? false, fzf, @@ -39,13 +37,8 @@ rustPlatform.buildRustPackage rec { installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - [ bash ] # for git-credential-rbw - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 # Needs _NSPasteboardTypeFileURL, can be removed once x86_64-darwin defaults to a higher SDK - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.frameworks.AppKit - ]; + buildInputs = [ bash ] # for git-credential-rbw + ; preConfigure = lib.optionalString stdenv.hostPlatform.isLinux '' export OPENSSL_INCLUDE_DIR="${openssl.dev}/include" diff --git a/pkgs/by-name/rc/rcodesign/package.nix b/pkgs/by-name/rc/rcodesign/package.nix index 3b6efcc0ce78d6..a0118bc3423bc0 100644 --- a/pkgs/by-name/rc/rcodesign/package.nix +++ b/pkgs/by-name/rc/rcodesign/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - apple-sdk_11, uutils-coreutils, }: @@ -25,8 +24,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-xMhyKovXoBPZp6epWQ+CYODpyvHgpv6eZfdWPTuDnK8="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - cargoBuildFlags = [ # Only build the binary we want "--bin" diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix index d0355c64e8ee22..8f6d56e3a3fac2 100644 --- a/pkgs/by-name/re/rehex/package.nix +++ b/pkgs/by-name/re/rehex/package.nix @@ -14,7 +14,6 @@ lua53Packages, perlPackages, gtk3, - apple-sdk_11, }: stdenv.mkDerivation rec { @@ -50,8 +49,7 @@ stdenv.mkDerivation rec { perl TemplateToolkit ]) - ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ]; makeFlags = [ "prefix=${placeholder "out"}" diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 6104fa868e8a43..fccc14ce3ce3a2 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -19,7 +19,6 @@ openssl, vulkan-loader, wayland, - apple-sdk_11, versionCheckHook, @@ -63,21 +62,14 @@ rustPlatform.buildRustPackage rec { rustfmt ]; - buildInputs = - [ - freetype - glib - gtk3 - (lib.getDev openssl) - libxkbcommon - vulkan-loader - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Undefined symbols for architecture x86_64: "_NSAccessibilityTabButtonSubrole" - # ld: symbol(s) not found for architecture x86_64 - apple-sdk_11 - ]; + buildInputs = [ + freetype + glib + gtk3 + (lib.getDev openssl) + libxkbcommon + vulkan-loader + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ]; addDlopenRunpaths = map (p: "${lib.getLib p}/lib") ( lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/re/rewatch/package.nix b/pkgs/by-name/re/rewatch/package.nix index b4f030c3746cc7..e0ee1ebfc76b81 100644 --- a/pkgs/by-name/re/rewatch/package.nix +++ b/pkgs/by-name/re/rewatch/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, nix-update-script, - apple-sdk_11, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-cZTA50gm7o+vBaRNjpZI0LQkXaHIukVTBXoYMUubZgw="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; - doCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix index f8e6746c925cc6..93009c71cfb461 100644 --- a/pkgs/by-name/ri/ride/package.nix +++ b/pkgs/by-name/ri/ride/package.nix @@ -12,7 +12,6 @@ copyDesktopItems, makeDesktopItem, electron, - apple-sdk_11, }: buildNpmPackage rec { @@ -70,8 +69,6 @@ buildNpmPackage rec { makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; # our patch adds the platform detecting build option diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix index 7c6a6094b12b2c..af28b721a61242 100644 --- a/pkgs/by-name/ri/rio/package.nix +++ b/pkgs/by-name/ri/rio/package.nix @@ -17,7 +17,6 @@ libGL, vulkan-loader, libxkbcommon, - apple-sdk_11, withX11 ? !stdenv.hostPlatform.isDarwin, libX11, @@ -81,7 +80,6 @@ rustPlatform.buildRustPackage rec { rlinkLibs ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil - apple-sdk_11 # Needs _NSPasteboardTypeFileURL, can be removed once x86_64-darwin defaults to a higher SDK ]; outputs = [ diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix index d90ad5d81bdd8b..43d4bbc66e8576 100644 --- a/pkgs/by-name/ri/ripgrep/package.nix +++ b/pkgs/by-name/ri/ripgrep/package.nix @@ -6,7 +6,6 @@ rustPlatform, installShellFiles, pkg-config, - apple-sdk_11, withPCRE2 ? true, pcre2, }: @@ -29,9 +28,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-b+iA8iTYWlczBpNq9eyHrWG8LMU4WPBzaU6pQRht+yE="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional withPCRE2 pkg-config; - buildInputs = - lib.optional withPCRE2 pcre2 - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + buildInputs = lib.optional withPCRE2 pcre2; buildFeatures = lib.optional withPCRE2 "pcre2"; diff --git a/pkgs/by-name/ru/rucola/package.nix b/pkgs/by-name/ru/rucola/package.nix index f39186d6118cef..a2cabcfa717002 100644 --- a/pkgs/by-name/ru/rucola/package.nix +++ b/pkgs/by-name/ru/rucola/package.nix @@ -5,8 +5,6 @@ pkg-config, oniguruma, stdenv, - apple-sdk_11, - darwinMinVersionHook, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - oniguruma - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "10.13") - ]; + buildInputs = [ + oniguruma + ]; env = { RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/pkgs/by-name/sc/scopehal-apps/package.nix b/pkgs/by-name/sc/scopehal-apps/package.nix index 7b634215051834..aa7d247526b2d1 100644 --- a/pkgs/by-name/sc/scopehal-apps/package.nix +++ b/pkgs/by-name/sc/scopehal-apps/package.nix @@ -22,8 +22,6 @@ spirv-tools, ffts, moltenvk, - apple-sdk_11, - darwinMinVersionHook, llvmPackages, }: @@ -73,8 +71,6 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "10.15") moltenvk ]; diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix index 3b47b20b8929c6..bdbab146d4f2d4 100644 --- a/pkgs/by-name/sh/shipwright/package.nix +++ b/pkgs/by-name/sh/shipwright/package.nix @@ -27,7 +27,6 @@ zenity, makeWrapper, darwin, - apple-sdk_11, libicns, }: stdenv.mkDerivation (finalAttrs: { @@ -94,8 +93,7 @@ stdenv.mkDerivation (finalAttrs: { libXext libpulseaudio zenity - ] - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + ]; cmakeFlags = [ (lib.cmakeBool "NON_PORTABLE" true) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 0b6de93b497f47..91c7443ee2d5de 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -6,8 +6,6 @@ cmake, pkg-config, - apple-sdk_11, - darwinMinVersionHook, dbus, openssl, sqlite, @@ -24,22 +22,22 @@ stdenv.mkDerivation rec { hash = "sha256-51tjKKpcAF8zsIy5clllOBXQabFh4Lcaa1IUic9CmJA="; }; - nativeBuildInputs = [ - cmake - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - pkg-config - ]; - - buildInputs = [ - openssl - sqlite - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - dbus - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Needed for `utimensat` on `x86_64-darwin` - apple-sdk_11 - (darwinMinVersionHook "11.3") - ]; + nativeBuildInputs = + [ + cmake + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + ]; + + buildInputs = + [ + openssl + sqlite + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + dbus + ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/sk/skhd/package.nix b/pkgs/by-name/sk/skhd/package.nix index 60321fae3557a8..ba67625484606e 100644 --- a/pkgs/by-name/sk/skhd/package.nix +++ b/pkgs/by-name/sk/skhd/package.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchFromGitHub, - apple-sdk_11, - darwinMinVersionHook, nix-update-script, versionCheckHook, }: @@ -18,11 +16,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-fnkWws/g4BdHKDRhqoCpdPFUavOHdk8R7h7H1dAdAYI="; }; - buildInputs = [ - apple-sdk_11 - (darwinMinVersionHook "10.13") - ]; - makeFlags = [ "BUILD_PATH=$(out)/bin" ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix index cd7c5707520ce0..46e6e78d4356b0 100644 --- a/pkgs/by-name/sk/skia/package.nix +++ b/pkgs/by-name/sk/skia/package.nix @@ -19,7 +19,6 @@ , xcbuild , cctools , zlib -, apple-sdk_11 , fixDarwinDylibNames , enableVulkan ? !stdenv.hostPlatform.isDarwin @@ -70,9 +69,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableVulkan [ vulkan-headers vulkan-memory-allocator - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 # can be removed once x86_64-darwin defaults to a newer SDK - ]; + ] ; gnFlags = let cpu = { diff --git a/pkgs/by-name/sp/spicy-parser-generator/package.nix b/pkgs/by-name/sp/spicy-parser-generator/package.nix index d578353f064b20..bd42478db9a79d 100644 --- a/pkgs/by-name/sp/spicy-parser-generator/package.nix +++ b/pkgs/by-name/sp/spicy-parser-generator/package.nix @@ -8,7 +8,6 @@ bison, flex, zlib, - apple-sdk_11, }: stdenv.mkDerivation rec { @@ -33,14 +32,10 @@ stdenv.mkDerivation rec { python3 ]; - buildInputs = - [ - flex - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; + buildInputs = [ + flex + zlib + ]; postPatch = '' patchShebangs scripts tests/scripts diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix index f4c9babb9ddafe..4e4ce8228465e1 100644 --- a/pkgs/by-name/sp/spotify-player/package.nix +++ b/pkgs/by-name/sp/spotify-player/package.nix @@ -15,7 +15,6 @@ dbus, fontconfig, libsixel, - apple-sdk_11, # build options withStreaming ? true, @@ -75,9 +74,6 @@ rustPlatform.buildRustPackage rec { dbus fontconfig ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 # can be removed once x86_64-darwin defaults to a newer SDK - ] ++ lib.optionals withSixel [ libsixel ] ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ] ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ] diff --git a/pkgs/by-name/st/stockfish/package.nix b/pkgs/by-name/st/stockfish/package.nix index 502f9f9b478f12..50216db2b95e61 100644 --- a/pkgs/by-name/st/stockfish/package.nix +++ b/pkgs/by-name/st/stockfish/package.nix @@ -4,8 +4,6 @@ fetchurl, fetchFromGitHub, apple-sdk, - apple-sdk_11, - darwinMinVersionHook, }: let @@ -64,13 +62,6 @@ stdenv.mkDerivation rec { ]; buildFlags = [ "build" ]; - buildInputs = - lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder apple-sdk.version "11") - [ - apple-sdk_11 - (darwinMinVersionHook "10.15") - ]; - enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix index 6fb16457c466a4..abe38207bf9077 100644 --- a/pkgs/by-name/ta/taterclient-ddnet/package.nix +++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix @@ -28,7 +28,6 @@ spirv-tools, gtest, glew, - apple-sdk_11, }: let clientExecutable = "TaterClient-DDNet"; diff --git a/pkgs/by-name/td/tdb/package.nix b/pkgs/by-name/td/tdb/package.nix index 81e663908d1d30..5672f400324dec 100644 --- a/pkgs/by-name/td/tdb/package.nix +++ b/pkgs/by-name/td/tdb/package.nix @@ -1,15 +1,16 @@ -{ lib, stdenv -, fetchurl -, pkg-config -, wafHook -, buildPackages -, python3 -, readline -, libxslt -, libxcrypt -, apple-sdk_11 -, docbook-xsl-nons -, docbook_xml_dtd_45 +{ + lib, + stdenv, + fetchurl, + pkg-config, + wafHook, + buildPackages, + python3, + readline, + libxslt, + libxcrypt, + docbook-xsl-nons, + docbook_xml_dtd_45, }: stdenv.mkDerivation rec { @@ -34,8 +35,6 @@ stdenv.mkDerivation rec { python3 readline # required to build python libxcrypt - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 ]; # otherwise the configure script fails with @@ -47,17 +46,21 @@ stdenv.mkDerivation rec { wafPath = "buildtools/bin/waf"; - wafConfigureFlags = [ - "--bundled-libraries=NONE" - "--builtin-libraries=replace" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-compile" - "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" - ]; + wafConfigureFlags = + [ + "--bundled-libraries=NONE" + "--builtin-libraries=replace" + ] + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross-compile" + "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" + ]; - postFixup = if stdenv.hostPlatform.isDarwin - then ''install_name_tool -id $out/lib/libtdb.dylib $out/lib/libtdb.dylib'' - else null; + postFixup = + if stdenv.hostPlatform.isDarwin then + ''install_name_tool -id $out/lib/libtdb.dylib $out/lib/libtdb.dylib'' + else + null; # python-config from build Python gives incorrect values when cross-compiling. # If python-config is not found, the build falls back to using the sysconfig diff --git a/pkgs/by-name/te/tealdeer/package.nix b/pkgs/by-name/te/tealdeer/package.nix index b6e634fd005f9b..3d029f8e8ece26 100644 --- a/pkgs/by-name/te/tealdeer/package.nix +++ b/pkgs/by-name/te/tealdeer/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, installShellFiles, - apple-sdk_11, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ZKaq/JqH/Y2Cs9LLnlt1Gawe4R+kvS3vpUcNK95uujk="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/by-name/to/ton/package.nix b/pkgs/by-name/to/ton/package.nix index 22a34bdcc2005e..4423a274ddffda 100644 --- a/pkgs/by-name/to/ton/package.nix +++ b/pkgs/by-name/to/ton/package.nix @@ -14,8 +14,6 @@ secp256k1, zlib, nix-update-script, - darwinMinVersionHook, - apple-sdk_11, }: stdenv.mkDerivation rec { @@ -41,22 +39,16 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - gperf - libmicrohttpd - libsodium - lz4 - openssl - readline - secp256k1 - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer - (darwinMinVersionHook "10.13") - apple-sdk_11 - ]; + buildInputs = [ + gperf + libmicrohttpd + libsodium + lz4 + openssl + readline + secp256k1 + zlib + ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index e91fb9a2603e19..2d2d42bf3087cc 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - apple-sdk_11, capnproto, extra-cmake-modules, fetchFromGitHub, @@ -45,7 +44,7 @@ rustPlatform.buildRustPackage rec { openssl rust-jemalloc-sys zlib - ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + ]; cargoBuildFlags = [ "--package" diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index 2f776cb3c3af09..d67d50871d11d2 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, runtimeShell, - apple-sdk_11, cacert, cmake, cmakerc, @@ -42,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cmakerc fmt - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + ]; patches = [ ./change-lock-location.patch diff --git a/pkgs/by-name/vi/vimv-rs/package.nix b/pkgs/by-name/vi/vimv-rs/package.nix index ec0a0c3d4c3b15..bff4c550b940df 100644 --- a/pkgs/by-name/vi/vimv-rs/package.nix +++ b/pkgs/by-name/vi/vimv-rs/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - apple-sdk_11, }: rustPlatform.buildRustPackage rec { @@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-rYQxIttuGBGEkYkFtSBl8ce1I/Akm6FxeITJcaIeP6M="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - meta = with lib; { description = "Command line utility for batch-renaming files"; homepage = "https://www.dmulholl.com/dev/vimv.html"; diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index 1a0da53573ffd2..46b5c3b04015b0 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -15,8 +15,6 @@ gflags, libevent, double-conversion, - apple-sdk_11, - darwinMinVersionHook, gtest, @@ -45,20 +43,15 @@ stdenv.mkDerivation (finalAttrs: { removeReferencesTo ]; - buildInputs = - [ - folly - fizz - openssl - glog - gflags - libevent - double-conversion - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + folly + fizz + openssl + glog + gflags + libevent + double-conversion + ]; checkInputs = [ gtest diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 8ee1aaf2c3b47c..c020c76e83bb08 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -26,8 +26,6 @@ fbthrift, fb303, cpptoml, - apple-sdk_11, - darwinMinVersionHook, gtest, @@ -58,25 +56,20 @@ stdenv.mkDerivation (finalAttrs: { removeReferencesTo ]; - buildInputs = - [ - pcre2 - openssl - gflags - glog - libevent - edencommon - folly - fizz - wangle - fbthrift - fb303 - cpptoml - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + pcre2 + openssl + gflags + glog + libevent + edencommon + folly + fizz + wangle + fbthrift + fb303 + cpptoml + ]; checkInputs = [ gtest diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index bfc3c7135e89dc..316e881176023c 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -2,11 +2,9 @@ lib, fetchFromGitHub, rustPlatform, - stdenv, nixosTests, nix-update-script, versionCheckHook, - apple-sdk_11, }: let @@ -29,10 +27,6 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ versionCheckHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; - doInstallCheck = true; checkFlags = [ diff --git a/pkgs/by-name/zl/zls/package.nix b/pkgs/by-name/zl/zls/package.nix index 8c6c3a90310ff5..55d0c5a7a57dc8 100644 --- a/pkgs/by-name/zl/zls/package.nix +++ b/pkgs/by-name/zl/zls/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, zig_0_13, callPackage, - apple-sdk_11, }: stdenv.mkDerivation (finalAttrs: { @@ -25,8 +24,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ zig_0_13.hook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - postPatch = '' ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; diff --git a/pkgs/by-name/zo/zon2nix/package.nix b/pkgs/by-name/zo/zon2nix/package.nix index 953ee8eece3273..82135e9ddd2bf5 100644 --- a/pkgs/by-name/zo/zon2nix/package.nix +++ b/pkgs/by-name/zo/zon2nix/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, zig_0_11, nix, - apple-sdk_11, }: stdenv.mkDerivation rec { @@ -22,8 +21,6 @@ stdenv.mkDerivation rec { zig_0_11.hook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - zigBuildFlags = [ "-Dnix=${lib.getExe nix}" ]; diff --git a/pkgs/by-name/zt/ztags/package.nix b/pkgs/by-name/zt/ztags/package.nix index c2529025ff8d60..5640918d8c5572 100644 --- a/pkgs/by-name/zt/ztags/package.nix +++ b/pkgs/by-name/zt/ztags/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, scdoc, zig_0_13, - apple-sdk_11, }: let @@ -26,8 +25,6 @@ stdenv.mkDerivation (finalAttrs: { zig.hook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - postInstall = '' zig build docs --prefix $out ''; diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index 319ed5081d0cce..49625a945c21e8 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -5,7 +5,6 @@ tzdata, substituteAll, iana-etc, - apple-sdk_11, xcbuild, mailcap, buildPackages, @@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ - apple-sdk_11 xcbuild ]; diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 388b10a02d02c6..85c9be094a0da1 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -5,7 +5,6 @@ tzdata, substituteAll, iana-etc, - apple-sdk_11, xcbuild, mailcap, buildPackages, @@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ - apple-sdk_11 xcbuild ]; diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 92653cfeebde92..7f95a41f14edc1 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -5,7 +5,6 @@ tzdata, substituteAll, iana-etc, - apple-sdk_11, xcbuild, mailcap, buildPackages, @@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ - apple-sdk_11 xcbuild ]; diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index ea4c6d1b282d16..3d7b4096690b55 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -2,11 +2,9 @@ lib, stdenv, alsa-lib, - apple-sdk_11, autoPatchelfHook, cairo, cups, - darwinMinVersionHook, fontconfig, glib, glibc, @@ -31,7 +29,6 @@ let "lib" "stdenv" "alsa-lib" - "apple-sdk_11" "autoPatchelfHook" "cairo" "cups" @@ -127,21 +124,16 @@ let zlib ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib # libasound.so wanted by lib/libjsound.so - fontconfig - (lib.getLib stdenv.cc.cc) # libstdc++.so.6 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib # libasound.so wanted by lib/libjsound.so + fontconfig + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libXtst + ]; postInstall = let diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index fd1829bb0bed4c..a18deec89aade4 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -1,9 +1,15 @@ -{ lib, stdenv, fetchFromGitHub -, cmake -, brotli, libev, nghttp3, quictls -, apple-sdk_11 -, withJemalloc ? false, jemalloc -, curlHTTP3 +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + brotli, + libev, + nghttp3, + quictls, + withJemalloc ? false, + jemalloc, + curlHTTP3, }: stdenv.mkDerivation rec { @@ -18,7 +24,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -26,8 +36,6 @@ stdenv.mkDerivation rec { libev nghttp3 quictls - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 ] ++ lib.optional withJemalloc jemalloc; cmakeFlags = [ diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index 56907ada323b88..f534b895a69b69 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -13,9 +13,6 @@ pyproject-metadata, scikit-build-core, - # buildInputs - apple-sdk_11, - # dependencies diskcache, jinja2, @@ -70,18 +67,14 @@ buildPythonPackage rec { scikit-build-core ]; - buildInputs = - lib.optionals cudaSupport ( - with cudaPackages; - [ - cuda_cudart # cuda_runtime.h - cuda_cccl # - libcublas # cublas_v2.h - ] - ) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; + buildInputs = lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cudart # cuda_runtime.h + cuda_cccl # + libcublas # cublas_v2.h + ] + ); dependencies = [ diskcache diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix index a01f9a17500615..8255cd57843964 100644 --- a/pkgs/development/python-modules/nanobind/default.nix +++ b/pkgs/development/python-modules/nanobind/default.nix @@ -1,9 +1,7 @@ { lib, stdenv, - apple-sdk_11, buildPythonPackage, - darwinMinVersionHook, fetchFromGitHub, pythonOlder, @@ -49,13 +47,6 @@ buildPythonPackage rec { dependencies = [ eigen ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer - (darwinMinVersionHook "10.13") - - apple-sdk_11 - ]; - dontUseCmakeBuildDir = true; preCheck = '' diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix index 14b8ff40533ace..99c0d234a3e1df 100644 --- a/pkgs/development/python-modules/soxr/default.nix +++ b/pkgs/development/python-modules/soxr/default.nix @@ -1,8 +1,6 @@ { lib, - apple-sdk_11, buildPythonPackage, - darwinMinVersionHook, fetchFromGitHub, pythonOlder, stdenv, @@ -63,13 +61,7 @@ buildPythonPackage rec { typing-extensions ]; - buildInputs = - [ libsoxr ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer - (darwinMinVersionHook "10.13") - apple-sdk_11 - ]; + buildInputs = [ libsoxr ]; dependencies = [ numpy ]; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 338809a6f97af2..eb0d02f8af11c9 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - apple-sdk_11, fetchFromGitHub, ## wandb-core @@ -179,8 +178,6 @@ buildPythonPackage rec { hatchling ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - dependencies = [ click diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index fa744d03ede9e5..48c2e8e43f2937 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -11,7 +11,6 @@ pythonOlder, pyyaml, setuptools, - apple-sdk_11, }: buildPythonPackage rec { @@ -26,8 +25,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - optional-dependencies.watchmedo = [ pyyaml ]; nativeCheckInputs = diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 7ab1ef89e2e77d..f69c15ecfa3fc6 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -8,7 +8,6 @@ pkg-config, rustPlatform, rustc, - apple-sdk_11, curl, freetype, libGLU, @@ -87,9 +86,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ] ); postPatch = '' diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 8249fdccc2abc9..109d3f24c63afd 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -1,9 +1,7 @@ { - stdenv, lib, rustPlatform, fetchFromGitHub, - apple-sdk_11, nixosTests, nix-update-script, }: @@ -38,8 +36,6 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - passthru = { updateScript = nix-update-script { }; tests = { diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 2a50e5933d3ac6..2623821e16dc0c 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -7,7 +7,6 @@ removeReferencesTo, autoAddDriverRunpath, apple-sdk_15, - darwinMinVersionHook, versionCheckHook, rocmPackages, cudaSupport ? config.cudaSupport, @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 - (darwinMinVersionHook "10.15") ]; installFlags = [ "PREFIX=$(out)" ];