From caade838e8d337a73e36b851529b736883ee191e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 2 Jan 2025 21:31:00 -0600
Subject: [PATCH] treewide: unpin apple-sdk_11
---
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/en/en-croissant/package.nix | 21 +++++-------
pkgs/by-name/es/espanso/package.nix | 6 ----
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/gc/gcs/package.nix | 4 ---
pkgs/by-name/gg/gg-jj/package.nix | 4 +--
pkgs/by-name/gh/ghc_filesystem/package.nix | 3 --
pkgs/by-name/gl/glsl_analyzer/package.nix | 7 ----
13 files changed, 49 insertions(+), 104 deletions(-)
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/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/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/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/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}"'