From 16f8f20ef4789f2ceb46acea5b26baac01bbab62 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 13 Nov 2024 21:57:31 -0500 Subject: [PATCH] turbo: migrate to new darwin SDK pattern Part of #354146 --- pkgs/by-name/tu/turbo-unwrapped/package.nix | 29 +++++++-------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index d4c20bb38ba17..59d0d913c8c44 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -1,11 +1,10 @@ { - stdenv, lib, - fetchFromGitHub, - rustPlatform, + stdenv, + apple-sdk_11, capnproto, - darwin, extra-cmake-modules, + fetchFromGitHub, fontconfig, llvmPackages, nix-update-script, @@ -13,6 +12,7 @@ pkg-config, protobuf, rust-jemalloc-sys, + rustPlatform, zlib, }: @@ -39,21 +39,12 @@ rustPlatform.buildRustPackage rec { # https://github.com/vercel/turbo/blob/ea740706e0592b3906ab34c7cfa1768daafc2a84/CONTRIBUTING.md#linux-dependencies ++ lib.optional stdenv.hostPlatform.isLinux llvmPackages.bintools; - buildInputs = - [ - fontconfig - openssl - rust-jemalloc-sys - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - CoreFoundation - CoreServices - IOKit - ] - ); + buildInputs = [ + fontconfig + openssl + rust-jemalloc-sys + zlib + ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; cargoBuildFlags = [ "--package"