Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

turbo: migrate to new darwin SDK pattern #355802

Merged
merged 1 commit into from
Nov 14, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 10 additions & 19 deletions pkgs/by-name/tu/turbo-unwrapped/package.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
stdenv,
lib,
fetchFromGitHub,
rustPlatform,
stdenv,
apple-sdk_11,
capnproto,
darwin,
extra-cmake-modules,
fetchFromGitHub,
fontconfig,
llvmPackages,
nix-update-script,
openssl,
pkg-config,
protobuf,
rust-jemalloc-sys,
rustPlatform,
zlib,
}:

Expand All @@ -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"
Expand Down