treewide: unpin apple-sdk_11 j-m

This commit is contained in:
Austin Horstman
2025-01-02 21:36:18 -06:00
parent 013bcf290f
commit 7b2e42fffd
11 changed files with 14 additions and 61 deletions
-5
View File
@@ -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
+1 -7
View File
@@ -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 = ''
+1 -2
View File
@@ -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
+7 -12
View File
@@ -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;
-3
View File
@@ -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
'';
-4
View File
@@ -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
];
-4
View File
@@ -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
+4 -12
View File
@@ -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.
-3
View File
@@ -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";
@@ -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 = [
-4
View File
@@ -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" ];