diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 4a06c49e49ef..04253607aadb 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -32,7 +32,6 @@ qtnetworkauth, qttools, nixosTests, - apple-sdk_11, }: stdenv.mkDerivation (finalAttrs: { @@ -127,9 +126,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib qtwayland - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 ]; postInstall = diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index ea649595d645..83a76824e405 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -19,7 +19,6 @@ wayland, gobject-introspection, xorg, - apple-sdk_11, }: let rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [ @@ -94,7 +93,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc - apple-sdk_11 ]; postInstall = diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix index f9c25f94a4ba..51961cc76e5a 100644 --- a/pkgs/applications/emulators/86box/default.nix +++ b/pkgs/applications/emulators/86box/default.nix @@ -1,6 +1,5 @@ { stdenv, - apple-sdk_11, lib, fetchFromGitHub, cmake, @@ -90,8 +89,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optional enableWayland wayland - ++ lib.optional enableVncRenderer libvncserver - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + ++ lib.optional enableVncRenderer libvncserver; cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 7a985b7ad940..c11e062e33e0 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -11,11 +11,11 @@ docbook_xml_dtd_45, docbook_xsl, libxslt, - apple-sdk_11, + apple-sdk, }: let - xnu = apple-sdk_11.sourceRelease "xnu"; + xnu = apple-sdk.sourceRelease "xnu"; in stdenv.mkDerivation rec { pname = "lsyncd"; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_45 docbook_xsl libxslt - ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + ]; meta = with lib; { homepage = "https://github.com/axkibe/lsyncd"; diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index af9088d8a068..515f8a193311 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -5,8 +5,6 @@ zlib, ncurses, libiconv, - apple-sdk_11, - darwinMinVersionHook, }: stdenv.mkDerivation (finalAttrs: { @@ -22,8 +20,6 @@ stdenv.mkDerivation (finalAttrs: { libiconv ncurses zlib - apple-sdk_11 - (darwinMinVersionHook "11.0") ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 61b8cfdf68c5..35680d240ae6 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -5,7 +5,6 @@ cmake, pkg-config, stdenv, - apple-sdk_11, curl, openssl, buildPackages, @@ -36,7 +35,7 @@ rustPlatform.buildRustPackage rec { 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 '' installShellCompletion --cmd gix \ diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index 45680a42e9ed..e1e4df52f02a 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, - apple-sdk_11, - darwinMinVersionHook, glibcLocales, # The GraalVM derivation to use graalvmDrv, @@ -35,8 +33,6 @@ let extraArgs = builtins.removeAttrs args [ "lib" "stdenv" - "apple-sdk_11" - "darwinMinVersionHook" "glibcLocales" "jar" "dontUnpack" @@ -60,11 +56,6 @@ stdenv.mkDerivation ( removeReferencesTo ]; - buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; - nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ]; buildPhase = diff --git a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix index 534db5bfb1b5..06224cfc0812 100644 --- a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix +++ b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, rustPlatform, libiconv, - apple-sdk_11, }: rustPlatform.buildRustPackage rec { @@ -22,7 +21,6 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - apple-sdk_11 ]; # Compilation during tests fails if this env var is not set. diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 7ab1ef89e2e7..f69c15ecfa3f 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -8,7 +8,6 @@ pkg-config, rustPlatform, rustc, - apple-sdk_11, curl, freetype, libGLU, @@ -87,9 +86,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ] ); postPatch = '' diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 8249fdccc2ab..109d3f24c63a 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -1,9 +1,7 @@ { - stdenv, lib, rustPlatform, fetchFromGitHub, - apple-sdk_11, nixosTests, nix-update-script, }: @@ -38,8 +36,6 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - passthru = { updateScript = nix-update-script { }; tests = { diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 2a50e5933d3a..2623821e16dc 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -7,7 +7,6 @@ removeReferencesTo, autoAddDriverRunpath, apple-sdk_15, - darwinMinVersionHook, versionCheckHook, rocmPackages, cudaSupport ? config.cudaSupport, @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 - (darwinMinVersionHook "10.15") ]; installFlags = [ "PREFIX=$(out)" ];