diff --git a/pkgs/by-name/ag/age-plugin-yubikey/package.nix b/pkgs/by-name/ag/age-plugin-yubikey/package.nix index 4c0446e586fd..986e7b0a31e1 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 5376c79a4072..508d26bace0b 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 97a547f25bb0..2466eb283aa0 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.isDarwin) [ + 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 6af1cb6d4e50..5e24c6d8f8fd 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 e68a8bcf111b..061aea770cda 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 c2b116f269f2..e2aa70b1694f 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 33b91c6db5d2..9a19a12e500f 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 51d771e9a3eb..c5203edbfe3a 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 e6ffdea18a35..7de25e8cd9c5 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 bc03d6bbce03..c98b96e2affb 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 e461c80cd04b..67dda48c1ad5 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 f33a0f385b67..c79eefb5086a 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 22eaf9a13bc5..cfa7806285f3 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 03f09fab4025..779144322f25 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 9d6a78b361a4..6ae3ea109013 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" ];