treewide: unpin apple-sdk_11

This commit is contained in:
Austin Horstman 2025-01-02 19:20:02 -06:00
parent 013bcf290f
commit 1b884f28bf
No known key found for this signature in database
11 changed files with 5 additions and 39 deletions

View File

@ -32,7 +32,6 @@
qtnetworkauth, qtnetworkauth,
qttools, qttools,
nixosTests, nixosTests,
apple-sdk_11,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -127,9 +126,6 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib alsa-lib
qtwayland qtwayland
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
]; ];
postInstall = postInstall =

View File

@ -19,7 +19,6 @@
wayland, wayland,
gobject-introspection, gobject-introspection,
xorg, xorg,
apple-sdk_11,
}: }:
let let
rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [ rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [
@ -94,7 +93,6 @@ rustPlatform.buildRustPackage rec {
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
libobjc libobjc
apple-sdk_11
]; ];
postInstall = postInstall =

View File

@ -1,6 +1,5 @@
{ {
stdenv, stdenv,
apple-sdk_11,
lib, lib,
fetchFromGitHub, fetchFromGitHub,
cmake, cmake,
@ -90,8 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
] ]
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
++ lib.optional enableWayland wayland ++ lib.optional enableWayland wayland
++ lib.optional enableVncRenderer libvncserver ++ lib.optional enableVncRenderer libvncserver;
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
cmakeFlags = cmakeFlags =
lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF"

View File

@ -11,11 +11,11 @@
docbook_xml_dtd_45, docbook_xml_dtd_45,
docbook_xsl, docbook_xsl,
libxslt, libxslt,
apple-sdk_11, apple-sdk,
}: }:
let let
xnu = apple-sdk_11.sourceRelease "xnu"; xnu = apple-sdk.sourceRelease "xnu";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lsyncd"; pname = "lsyncd";
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
docbook_xml_dtd_45 docbook_xml_dtd_45
docbook_xsl docbook_xsl
libxslt libxslt
] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/axkibe/lsyncd"; homepage = "https://github.com/axkibe/lsyncd";

View File

@ -5,8 +5,6 @@
zlib, zlib,
ncurses, ncurses,
libiconv, libiconv,
apple-sdk_11,
darwinMinVersionHook,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -22,8 +20,6 @@ stdenv.mkDerivation (finalAttrs: {
libiconv libiconv
ncurses ncurses
zlib zlib
apple-sdk_11
(darwinMinVersionHook "11.0")
]; ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

View File

@ -5,7 +5,6 @@
cmake, cmake,
pkg-config, pkg-config,
stdenv, stdenv,
apple-sdk_11,
curl, curl,
openssl, openssl,
buildPackages, buildPackages,
@ -36,7 +35,7 @@ rustPlatform.buildRustPackage rec {
installShellFiles installShellFiles
]; ];
buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin then [ apple-sdk_11 ] else [ openssl ]); buildInputs = [ curl ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
preFixup = lib.optionalString canRunCmd '' preFixup = lib.optionalString canRunCmd ''
installShellCompletion --cmd gix \ installShellCompletion --cmd gix \

View File

@ -1,8 +1,6 @@
{ {
lib, lib,
stdenv, stdenv,
apple-sdk_11,
darwinMinVersionHook,
glibcLocales, glibcLocales,
# The GraalVM derivation to use # The GraalVM derivation to use
graalvmDrv, graalvmDrv,
@ -35,8 +33,6 @@ let
extraArgs = builtins.removeAttrs args [ extraArgs = builtins.removeAttrs args [
"lib" "lib"
"stdenv" "stdenv"
"apple-sdk_11"
"darwinMinVersionHook"
"glibcLocales" "glibcLocales"
"jar" "jar"
"dontUnpack" "dontUnpack"
@ -60,11 +56,6 @@ stdenv.mkDerivation (
removeReferencesTo removeReferencesTo
]; ];
buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ]; nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ];
buildPhase = buildPhase =

View File

@ -4,7 +4,6 @@
fetchFromGitHub, fetchFromGitHub,
rustPlatform, rustPlatform,
libiconv, libiconv,
apple-sdk_11,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -22,7 +21,6 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
libiconv libiconv
apple-sdk_11
]; ];
# Compilation during tests fails if this env var is not set. # Compilation during tests fails if this env var is not set.

View File

@ -8,7 +8,6 @@
pkg-config, pkg-config,
rustPlatform, rustPlatform,
rustc, rustc,
apple-sdk_11,
curl, curl,
freetype, freetype,
libGLU, libGLU,
@ -87,9 +86,6 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
libX11 libX11
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
]
); );
postPatch = '' postPatch = ''

View File

@ -1,9 +1,7 @@
{ {
stdenv,
lib, lib,
rustPlatform, rustPlatform,
fetchFromGitHub, fetchFromGitHub,
apple-sdk_11,
nixosTests, nixosTests,
nix-update-script, nix-update-script,
}: }:
@ -38,8 +36,6 @@ rustPlatform.buildRustPackage {
nativeBuildInputs = [ rustPlatform.bindgenHook ]; nativeBuildInputs = [ rustPlatform.bindgenHook ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
passthru = { passthru = {
updateScript = nix-update-script { }; updateScript = nix-update-script { };
tests = { tests = {

View File

@ -7,7 +7,6 @@
removeReferencesTo, removeReferencesTo,
autoAddDriverRunpath, autoAddDriverRunpath,
apple-sdk_15, apple-sdk_15,
darwinMinVersionHook,
versionCheckHook, versionCheckHook,
rocmPackages, rocmPackages,
cudaSupport ? config.cudaSupport, cudaSupport ? config.cudaSupport,
@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_15 apple-sdk_15
(darwinMinVersionHook "10.15")
]; ];
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];