treewide: unpin apple-sdk_11

NixOS · Jan 3, 2025 · 36b135c · 36b135c
1 parent 771c7e6
commit 36b135c
Show file tree

Hide file tree

Showing 107 changed files with 308 additions and 751 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.isLinux [ 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
@@ -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/ag/age-plugin-yubikey/package.nix b/pkgs/by-name/ag/age-plugin-yubikey/package.nix
@@ -6,7 +6,6 @@
   pkg-config,
   openssl,
   pcsclite,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -31,12 +30,9 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  buildInputs = [
+    openssl
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ];
 
   meta = with lib; {
     description = "YubiKey plugin for age";

diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
@@ -22,7 +22,6 @@
   wayland,
   xdg-utils,
 
-  apple-sdk_11,
 }:
 let
   rpathLibs =
@@ -65,11 +64,7 @@ rustPlatform.buildRustPackage rec {
     scdoc
   ];
 
-  buildInputs =
-    rpathLibs
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = rpathLibs;
 
   outputs = [
     "out"

diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix
@@ -4,12 +4,9 @@
   buildGoModule,
   fetchzip,
   pkg-config,
-  libicns,
   copyDesktopItems,
   makeDesktopItem,
   desktopToDarwinBundle,
-  apple-sdk_11,
-  darwinMinVersionHook,
   wayland,
   libxkbcommon,
   vulkan-headers,
@@ -44,23 +41,15 @@ buildGoModule rec {
       desktopToDarwinBundle
     ];
 
-  buildInputs =
-    if stdenv.hostPlatform.isDarwin then
-      [
-        apple-sdk_11
-        # metal dependencies require 10.13 or newer
-        (darwinMinVersionHook "10.13")
-      ]
-    else
-      [
-        wayland
-        libxkbcommon
-        vulkan-headers
-        libGL
-        xorg.libX11
-        xorg.libXcursor
-        xorg.libXfixes
-      ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    wayland
+    libxkbcommon
+    vulkan-headers
+    libGL
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXfixes
+  ];
 
   # Got different result in utf8 char length?
   checkFlags = [ "-skip=^TestClearAfter$" ];

diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix
@@ -2,7 +2,6 @@
   lib,
   SDL2,
   alsa-lib,
-  apple-sdk_11,
   autoPatchelfHook,
   fetchFromGitHub,
   gtk3,
@@ -67,9 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
       libpulseaudio
       openal
       udev
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
     ];
 
   appendRunpaths = [ (lib.makeLibraryPath [ vulkan-loader ]) ];

diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix
@@ -52,7 +52,6 @@
   wavpack,
   wxGTK32,
   gtk3,
-  apple-sdk_11,
   libpng,
   libjpeg,
 }:
@@ -144,7 +143,6 @@ stdenv.mkDerivation (finalAttrs: {
       util-linux
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
       libpng
       libjpeg
     ];

diff --git a/pkgs/by-name/au/augustus/package.nix b/pkgs/by-name/au/augustus/package.nix
@@ -7,7 +7,6 @@
   SDL2_mixer,
   libpng,
   darwin,
-  apple-sdk_11,
   libicns,
   imagemagick,
 }:
@@ -37,7 +36,7 @@ stdenv.mkDerivation rec {
     SDL2
     SDL2_mixer
     libpng
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  ];
 
   installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
     runHook preInstall

diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix
@@ -4,8 +4,6 @@
   fetchFromGitHub,
   autoAddDriverRunpath,
   installShellFiles,
-  stdenv,
-  apple-sdk_11,
   versionCheckHook,
   nix-update-script,
 }:
@@ -28,10 +26,6 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
-  ];
-
   postInstall = ''
     installManPage target/tmp/bottom/manpage/btm.1
     installShellCompletion \

diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix
@@ -1,11 +1,9 @@
 {
   lib,
-  stdenv,
   buildNpmPackage,
   bruno,
   pkg-config,
   pango,
-  apple-sdk_11,
   testers,
   bruno-cli,
 }:
@@ -28,14 +26,9 @@ buildNpmPackage {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      pango
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fix for: https://github.com/NixOS/nixpkgs/issues/272156
-      apple-sdk_11
-    ];
+  buildInputs = [
+    pango
+  ];
 
   ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
 

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
@@ -13,7 +13,6 @@
   cairo,
   pango,
   npm-lockfile-fix,
-  apple-sdk_11,
 }:
 
 buildNpmPackage rec {
@@ -43,16 +42,11 @@ buildNpmPackage rec {
       copyDesktopItems
     ];
 
-  buildInputs =
-    [
-      pixman
-      cairo
-      pango
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fix for: https://github.com/NixOS/nixpkgs/issues/272156
-      apple-sdk_11
-    ];
+  buildInputs = [
+    pixman
+    cairo
+    pango
+  ];
 
   desktopItems = [
     (makeDesktopItem {

diff --git a/pkgs/by-name/bs/bsnes-hd/package.nix b/pkgs/by-name/bs/bsnes-hd/package.nix
@@ -2,9 +2,7 @@
   lib,
   SDL2,
   alsa-lib,
-  apple-sdk_11,
   fetchFromGitHub,
-  fetchpatch,
   gtk3,
   gtksourceview3,
   libX11,
@@ -69,8 +67,7 @@ stdenv.mkDerivation {
       alsa-lib
       openal
       libpulseaudio
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+    ];
 
   makeFlags =
     [

diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -31,8 +30,6 @@ rustPlatform.buildRustPackage rec {
       # assumes the target is x86_64-unknown-linux-gnu
       "--skip simple_project::it_checks_okay_project_correctly";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   meta = with lib; {
     description = "Cargo subcommand to check rust documentation for broken links";
     homepage = "https://github.com/deadlinks/cargo-deadlinks";