diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix index 7e3776be7575a..31c35734f3ed4 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,7 @@ 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/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix index d0355c64e8ee2..8f6d56e3a3fac 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 6104fa868e8a4..fccc14ce3ce3a 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 b4f030c3746cc..e0ee1ebfc76b8 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 f8e6746c925cc..93009c71cfb46 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 7c6a6094b12b2..af28b721a6124 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 d90ad5d81bdd8..43d4bbc66e857 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 f39186d6118ce..a2cabcfa71700 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 7b63421505183..aa7d247526b2d 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 3b47b20b8929c..bdbab146d4f2d 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 0b6de93b497f4..759e24e5226fe 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, @@ -35,10 +33,6 @@ stdenv.mkDerivation rec { 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") ]; installPhase = '' diff --git a/pkgs/by-name/sk/skhd/package.nix b/pkgs/by-name/sk/skhd/package.nix index 60321fae3557a..ba67625484606 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 cd7c5707520ce..46e6e78d4356b 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 d578353f064b2..bd42478db9a79 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 f4c9babb9ddaf..4e4ce8228465e 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 502f9f9b478f1..50216db2b95e6 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; {