diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index 060ea7cc2da2..871e79301580 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -15,8 +15,6 @@ wangle, fbthrift, gtest, - apple-sdk_11, - darwinMinVersionHook, nix-update-script, }: @@ -48,20 +46,15 @@ stdenv.mkDerivation (finalAttrs: { removeReferencesTo ]; - buildInputs = - [ - glog - gflags - folly - fb303 - wangle - fbthrift - gtest - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + glog + gflags + folly + fb303 + wangle + fbthrift + gtest + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index b03e66eb861c..97e7dbe5f8a4 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -13,8 +13,6 @@ fbthrift, fizz, wangle, - apple-sdk_11, - darwinMinVersionHook, nix-update-script, }: @@ -40,19 +38,14 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; - buildInputs = - [ - gflags - glog - folly - fbthrift - fizz - wangle - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + gflags + glog + folly + fbthrift + fizz + wangle + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index a189e7a66a93..92fcb3636b36 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -17,8 +17,6 @@ zlib, zstd, xxHash, - apple-sdk_11, - darwinMinVersionHook, mvfst, @@ -56,22 +54,17 @@ stdenv.mkDerivation (finalAttrs: { removeReferencesTo ]; - buildInputs = - [ - openssl - gflags - glog - folly - fizz - wangle - zlib - zstd - xxHash - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + openssl + gflags + glog + folly + fizz + wangle + zlib + zstd + xxHash + ]; propagatedBuildInputs = [ mvfst diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 4c5c1efe08c6..e02f683e21e6 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -14,8 +14,6 @@ zstd, gflags, libevent, - apple-sdk_11, - darwinMinVersionHook, folly, libsodium, @@ -49,19 +47,14 @@ stdenv.mkDerivation (finalAttrs: { removeReferencesTo ]; - buildInputs = - [ - openssl - glog - double-conversion - zstd - gflags - libevent - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + openssl + glog + double-conversion + zstd + gflags + libevent + ]; propagatedBuildInputs = [ folly diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index ca393d884a13..12f8170324b1 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -21,8 +21,6 @@ zstd, libiberty, libunwind, - apple-sdk_11, - darwinMinVersionHook, boost, fmt_11, @@ -64,26 +62,21 @@ stdenv.mkDerivation (finalAttrs: { ]; # See CMake/folly-deps.cmake in the Folly source tree. - buildInputs = - [ - boost - double-conversion - fast-float - gflags - glog - libevent - zlib - openssl - xz - lz4 - zstd - libiberty - libunwind - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + boost + double-conversion + fast-float + gflags + glog + libevent + zlib + openssl + xz + lz4 + zstd + libiberty + libunwind + ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index de686a269b51..f14b252cf745 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -11,8 +11,6 @@ folly, gflags, glog, - apple-sdk_11, - darwinMinVersionHook, fizz, @@ -44,16 +42,11 @@ stdenv.mkDerivation (finalAttrs: { removeReferencesTo ]; - buildInputs = - [ - folly - gflags - glog - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + folly + gflags + glog + ]; propagatedBuildInputs = [ fizz diff --git a/pkgs/by-name/rc/rcodesign/package.nix b/pkgs/by-name/rc/rcodesign/package.nix index 3b6efcc0ce78..a0118bc3423b 100644 --- a/pkgs/by-name/rc/rcodesign/package.nix +++ b/pkgs/by-name/rc/rcodesign/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - apple-sdk_11, uutils-coreutils, }: @@ -25,8 +24,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-xMhyKovXoBPZp6epWQ+CYODpyvHgpv6eZfdWPTuDnK8="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - cargoBuildFlags = [ # Only build the binary we want "--bin" diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index 1a0da53573ff..46b5c3b04015 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -15,8 +15,6 @@ gflags, libevent, double-conversion, - apple-sdk_11, - darwinMinVersionHook, gtest, @@ -45,20 +43,15 @@ stdenv.mkDerivation (finalAttrs: { removeReferencesTo ]; - buildInputs = - [ - folly - fizz - openssl - glog - gflags - libevent - double-conversion - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + folly + fizz + openssl + glog + gflags + libevent + double-conversion + ]; checkInputs = [ gtest diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 8ee1aaf2c3b4..c020c76e83bb 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -26,8 +26,6 @@ fbthrift, fb303, cpptoml, - apple-sdk_11, - darwinMinVersionHook, gtest, @@ -58,25 +56,20 @@ stdenv.mkDerivation (finalAttrs: { removeReferencesTo ]; - buildInputs = - [ - pcre2 - openssl - gflags - glog - libevent - edencommon - folly - fizz - wangle - fbthrift - fb303 - cpptoml - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]; + buildInputs = [ + pcre2 + openssl + gflags + glog + libevent + edencommon + folly + fizz + wangle + fbthrift + fb303 + cpptoml + ]; checkInputs = [ gtest diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index 319ed5081d0c..49625a945c21 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -5,7 +5,6 @@ tzdata, substituteAll, iana-etc, - apple-sdk_11, xcbuild, mailcap, buildPackages, @@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ - apple-sdk_11 xcbuild ]; diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 92653cfeebde..7f95a41f14ed 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -5,7 +5,6 @@ tzdata, substituteAll, iana-etc, - apple-sdk_11, xcbuild, mailcap, buildPackages, @@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ - apple-sdk_11 xcbuild ]; diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index ea4c6d1b282d..3d7b4096690b 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -2,11 +2,9 @@ lib, stdenv, alsa-lib, - apple-sdk_11, autoPatchelfHook, cairo, cups, - darwinMinVersionHook, fontconfig, glib, glibc, @@ -31,7 +29,6 @@ let "lib" "stdenv" "alsa-lib" - "apple-sdk_11" "autoPatchelfHook" "cairo" "cups" @@ -127,21 +124,16 @@ let zlib ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib # libasound.so wanted by lib/libjsound.so - fontconfig - (lib.getLib stdenv.cc.cc) # libstdc++.so.6 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - (darwinMinVersionHook "11.0") - ]); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib # libasound.so wanted by lib/libjsound.so + fontconfig + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libXtst + ]; postInstall = let diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index fd1829bb0bed..7ddfc135fa18 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake , brotli, libev, nghttp3, quictls -, apple-sdk_11 , withJemalloc ? false, jemalloc , curlHTTP3 }: @@ -26,8 +25,6 @@ stdenv.mkDerivation rec { libev nghttp3 quictls - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 ] ++ lib.optional withJemalloc jemalloc; cmakeFlags = [ diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index 56907ada323b..f534b895a69b 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -13,9 +13,6 @@ pyproject-metadata, scikit-build-core, - # buildInputs - apple-sdk_11, - # dependencies diskcache, jinja2, @@ -70,18 +67,14 @@ buildPythonPackage rec { scikit-build-core ]; - buildInputs = - lib.optionals cudaSupport ( - with cudaPackages; - [ - cuda_cudart # cuda_runtime.h - cuda_cccl # - libcublas # cublas_v2.h - ] - ) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; + buildInputs = lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cudart # cuda_runtime.h + cuda_cccl # + libcublas # cublas_v2.h + ] + ); dependencies = [ diskcache diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix index a01f9a175006..8255cd578439 100644 --- a/pkgs/development/python-modules/nanobind/default.nix +++ b/pkgs/development/python-modules/nanobind/default.nix @@ -1,9 +1,7 @@ { lib, stdenv, - apple-sdk_11, buildPythonPackage, - darwinMinVersionHook, fetchFromGitHub, pythonOlder, @@ -49,13 +47,6 @@ buildPythonPackage rec { dependencies = [ eigen ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer - (darwinMinVersionHook "10.13") - - apple-sdk_11 - ]; - dontUseCmakeBuildDir = true; preCheck = '' diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix index 14b8ff40533a..99c0d234a3e1 100644 --- a/pkgs/development/python-modules/soxr/default.nix +++ b/pkgs/development/python-modules/soxr/default.nix @@ -1,8 +1,6 @@ { lib, - apple-sdk_11, buildPythonPackage, - darwinMinVersionHook, fetchFromGitHub, pythonOlder, stdenv, @@ -63,13 +61,7 @@ buildPythonPackage rec { typing-extensions ]; - buildInputs = - [ libsoxr ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer - (darwinMinVersionHook "10.13") - apple-sdk_11 - ]; + buildInputs = [ libsoxr ]; dependencies = [ numpy ]; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 338809a6f97a..eb0d02f8af11 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - apple-sdk_11, fetchFromGitHub, ## wandb-core @@ -179,8 +178,6 @@ buildPythonPackage rec { hatchling ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - dependencies = [ click