treewide: unpin apple-sdk_11 pt 2 (NixOS#370471)

khaneliman · Jan 3, 2025 · 850540c · 850540c
2 parents 241f922 + 26d247b
commit 850540c
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 49 deletions.
diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix
@@ -28,7 +28,6 @@
   spirv-tools,
   gtest,
   glew,
-  apple-sdk_11,
 }:
 let
   clientExecutable = "TaterClient-DDNet";

diff --git a/pkgs/by-name/td/tdb/package.nix b/pkgs/by-name/td/tdb/package.nix
@@ -7,7 +7,6 @@
 , readline
 , libxslt
 , libxcrypt
-, apple-sdk_11
 , docbook-xsl-nons
 , docbook_xml_dtd_45
 }:
@@ -34,8 +33,6 @@ stdenv.mkDerivation rec {
     python3
     readline # required to build python
     libxcrypt
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
   ];
 
   # otherwise the configure script fails with

diff --git a/pkgs/by-name/te/tealdeer/package.nix b/pkgs/by-name/te/tealdeer/package.nix
@@ -1,10 +1,8 @@
 {
   lib,
-  stdenv,
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-ZKaq/JqH/Y2Cs9LLnlt1Gawe4R+kvS3vpUcNK95uujk=";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''

diff --git a/pkgs/by-name/to/ton/package.nix b/pkgs/by-name/to/ton/package.nix
@@ -14,8 +14,6 @@
   secp256k1,
   zlib,
   nix-update-script,
-  darwinMinVersionHook,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -41,22 +39,16 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      gperf
-      libmicrohttpd
-      libsodium
-      lz4
-      openssl
-      readline
-      secp256k1
-      zlib
-    ]
-    ++ 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
-      (darwinMinVersionHook "10.13")
-      apple-sdk_11
-    ];
+  buildInputs = [
+    gperf
+    libmicrohttpd
+    libsodium
+    lz4
+    openssl
+    readline
+    secp256k1
+    zlib
+  ];
 
   passthru.updateScript = nix-update-script { };
 

diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  apple-sdk_11,
   capnproto,
   extra-cmake-modules,
   fetchFromGitHub,
@@ -45,7 +44,7 @@ rustPlatform.buildRustPackage rec {
     openssl
     rust-jemalloc-sys
     zlib
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+  ];
 
   cargoBuildFlags = [
     "--package"

diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   runtimeShell,
-  apple-sdk_11,
   cacert,
   cmake,
   cmakerc,
@@ -42,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cmakerc
     fmt
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  ];
 
   patches = [
     ./change-lock-location.patch

diff --git a/pkgs/by-name/vi/vimv-rs/package.nix b/pkgs/by-name/vi/vimv-rs/package.nix
@@ -2,8 +2,6 @@
   lib,
   rustPlatform,
   fetchCrate,
-  stdenv,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-rYQxIttuGBGEkYkFtSBl8ce1I/Akm6FxeITJcaIeP6M=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   meta = with lib; {
     description = "Command line utility for batch-renaming files";
     homepage = "https://www.dmulholl.com/dev/vimv.html";

diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix
@@ -2,11 +2,9 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
-  stdenv,
   nixosTests,
   nix-update-script,
   versionCheckHook,
-  apple-sdk_11,
 }:
 
 let
@@ -29,10 +27,6 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [ versionCheckHook ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
-  ];
-
   doInstallCheck = true;
 
   checkFlags = [

diff --git a/pkgs/by-name/zl/zls/package.nix b/pkgs/by-name/zl/zls/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   zig_0_13,
   callPackage,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,8 +24,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ zig_0_13.hook ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   postPatch = ''
     ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
   '';

diff --git a/pkgs/by-name/zo/zon2nix/package.nix b/pkgs/by-name/zo/zon2nix/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   zig_0_11,
   nix,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,8 +21,6 @@ stdenv.mkDerivation rec {
     zig_0_11.hook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   zigBuildFlags = [
     "-Dnix=${lib.getExe nix}"
   ];

diff --git a/pkgs/by-name/zt/ztags/package.nix b/pkgs/by-name/zt/ztags/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   scdoc,
   zig_0_13,
-  apple-sdk_11,
 }:
 
 let
@@ -26,8 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
     zig.hook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   postInstall = ''
     zig build docs --prefix $out
   '';
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,6 @@ @@
       spirv-tools,
       gtest,
       glew,
-      apple-sdk_11,
     }:
     let
       clientExecutable = "TaterClient-DDNet";
@@ Expand Down @@