Skip to content

defaultCrateOverrides: remove obsolete darwin frameworks #374416

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.

Sign up for GitHub

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

Merged
flokli merged 1 commit into from
Jan 21, 2025
Merged

defaultCrateOverrides: remove obsolete darwin frameworks #374416

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 1 addition & 14 deletions pkgs/build-support/rust/default-crate-overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
, clang
, cmake
, curl
, darwin
, dbus
, dbus-glib
, fontconfig
Expand Down Expand Up @@ -47,9 +46,6 @@
, ...
}:

let
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
in
{
alsa-sys = attrs: {
nativeBuildInputs = [ pkg-config ];
Expand All @@ -71,8 +67,7 @@ in
};

cargo = attrs: {
buildInputs = [ openssl zlib curl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ];
buildInputs = [ openssl zlib curl ];
};

libz-sys = attrs: {
Expand Down Expand Up @@ -280,10 +275,6 @@ in
crateBin = [{ name = "rink"; path = "src/bin/rink.rs"; }];
};

security-framework-sys = attr: {
propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
};

sequoia-openpgp = attrs: {
buildInputs = [ gmp ];
};
Expand Down Expand Up @@ -319,10 +310,6 @@ in
buildInputs = [ sqlite gmp ];
};

serde_derive = attrs: {
buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
};

servo-fontconfig-sys = attrs: {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ freetype fontconfig ];
Expand Down