From 7b2e42fffd91815fa180b716f72f98021752e486 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 2 Jan 2025 21:31:11 -0600 Subject: [PATCH] treewide: unpin apple-sdk_11 j-m --- 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 ---- 11 files changed, 14 insertions(+), 61 deletions(-) diff --git a/pkgs/by-name/ja/jankyborders/package.nix b/pkgs/by-name/ja/jankyborders/package.nix index f1ed9b0d2292f..b0d8a1a731e06 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 a8fc62c337804..6d57a0be86343 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 429d34420baad..2d9cec42ba95e 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 8c14284c2bef8..33244e11a37b8 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 e9ec5ad93687e..41a5819ac1a7a 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 1cbe887b1f071..2d2378e9df5b3 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 98c2e8dfc8b12..e2b4bb682e635 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 c3745ba58f475..5e575efb2afd6 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 a5dfa15ba17fa..ea85e75a53292 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 695d42ca6ea0e..1323ac457f59c 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 323f79d0160ce..dc57ce4678f59 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" ];