Skip to content

remove legacy darwin sdk #627

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
Mic92 merged 1 commit into from
May 4, 2025
Merged

remove legacy darwin sdk #627

Show file tree
Hide file tree
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
23 changes: 8 additions & 15 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
openssl,
zlib,
zstd,
stdenv,
darwin,
spdx-license-list-data,
nix,
nurl,
Expand All @@ -35,19 +33,14 @@ rustPlatform.buildRustPackage rec {
pkg-config
];

buildInputs =
[
bzip2
curl
libgit2
openssl
zlib
zstd
]
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]
++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
darwin.apple_sdk.frameworks.CoreFoundation
];
buildInputs = [
bzip2
curl
libgit2
openssl
zlib
zstd
];

buildNoDefaultFeatures = true;

Expand Down
4 changes: 0 additions & 4 deletions src/lang/go/deps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,12 @@ pub(super) fn load_go_dependency(inputs: &mut AllInputs, pkg: GoPackage<'_>) {
"github.com/getlantern/systray" => {
native_build!("pkg-config");
build!("libayatana-appindicator"; linux);
framework!("Cocoa", "WebKit");
}
"github.com/google/gopacket" => build!("libpcap"),
"github.com/gotk3/gotk3" => {
native_build!("pkg-config", "wrapGAppsHook");
build!("gtk3");
}
"github.com/itchio/ox" => framework!("Cocoa"),
"github.com/itchio/screw" => framework!("Cocoa"),
"github.com/shirou/gopsutil" => {
if pkg.version.get().is_some_and(|version| {
version < Version::new(3, 21, 3)
Expand All @@ -37,7 +34,6 @@ pub(super) fn load_go_dependency(inputs: &mut AllInputs, pkg: GoPackage<'_>) {
}
"golang.design/x/clipboard" => {
build!("xorg.libX11"; linux);
framework!("Cocoa");
}
_ => {}
}
Expand Down
4 changes: 1 addition & 3 deletions src/lang/go/snapshots/nix_init__lang__go__tests__basic.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ AllInputs {
"gtk3",
"gtk4",
},
darwin: {
"darwin.apple_sdk.frameworks.Cocoa",
},
darwin: {},
aarch64_darwin: {},
x86_64_darwin: {},
linux: {
Expand Down
26 changes: 0 additions & 26 deletions src/lang/rust/deps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,18 @@ pub(super) fn load_rust_dependency(inputs: &mut AllInputs, resolve: &Resolve, pk

match &*pkg.name() {
"alsa-sys" => build!("alsa-lib"; linux),
"arboard" => framework!("AppKit"),
"ash" => build!("vulkan-loader"),
"atk-sys" => build!("atk"),
"bindgen" => native_build!("rustPlatform.bindgenHook"),
"bzip2-sys" => build!("bzip2"),
"cairo-sys-rs" => build!("cairo"),
"clipboard" => framework!("AppKit"),
"clipboard_macos" => framework!("AppKit"),
"cocoa" => framework!("AppKit"),
"cocoa-foundation" => framework!("Foundation"),
"copypasta" => framework!("AppKit"),
"core-graphics-types" => framework!("CoreGraphics"),
"core-text" => framework!("CoreText"),
"coreaudio-sys" => framework!("CoreAudio"),
"curl-sys" => {
native_build!("curl");
build!("curl");
}
"evdev-sys" => build!("evdev-sys"),
"expat-sys" => build!("expat"),
"freetype-sys" => build!("freetype"),
"fsevent-sys" => framework!("CoreFoundation", "CoreServices"),
"gdk-pixbuf-sys" => build!("gdk-pixbuf"),
"gdk-sys" => build!("gtk3"),
"gdk4-sys" => build!("gtk4"),
Expand Down Expand Up @@ -70,7 +60,6 @@ pub(super) fn load_rust_dependency(inputs: &mut AllInputs, resolve: &Resolve, pk
native_build!("wrapGAppsHook4");
build!("gtk4");
}
"io-kit-sys" => framework!("IOKit"),
"io-surface" => build!("IOSurface"),
"jemalloc-sys" => build!("rust-jemalloc-sys"),
"libadwaita-sys" => build!("libadwaita"),
Expand Down Expand Up @@ -145,9 +134,7 @@ pub(super) fn load_rust_dependency(inputs: &mut AllInputs, resolve: &Resolve, pk
llvm_pkgs,
);
}
"locate-dwarf" => framework!("CoreServices"),
"lzma-sys" => build!("xz"),
"metal" => framework!("Metal"),
"ncurses" => build!("ncurses"),
"nettle-sys" => build!("nettle"),
"onig_sys" => {
Expand All @@ -156,7 +143,6 @@ pub(super) fn load_rust_dependency(inputs: &mut AllInputs, resolve: &Resolve, pk
}
"openssl-sys" => {
build!("openssl");
framework!("Security");
if resolve.features(pkg).iter().any(|feat| feat == "vendored") {
environ!("OPENSSL_NO_VENDOR", "true");
}
Expand All @@ -169,10 +155,6 @@ pub(super) fn load_rust_dependency(inputs: &mut AllInputs, resolve: &Resolve, pk
"pq-sys" => build!("postgresql"),
"prost-build" => native_build!("protobuf"),
"rdkafka-sys" => build!("rdkafka"),
"readkey" => framework!("AppKit"),
"readmouse" => framework!("AppKit"),
"ring" => framework!("Security"),
"security-framework-sys" => framework!("Security"),
"servo-fontconfig-sys" => build!("fontconfig"),
"smithay-client-toolkit" => build!("libxkbcommon"),
"soup-sys" => build!("libsoup"),
Expand All @@ -181,23 +163,15 @@ pub(super) fn load_rust_dependency(inputs: &mut AllInputs, resolve: &Resolve, pk
"sourceview4-sys" => build!("gtksourceview4"),
"sourceview5-sys" => build!("gtksourceview5"),
"spirv-tools-sys" => build!("spirv-tools"),
"sys-locale" => framework!("CoreFoundation"),
"sysinfo" => framework!("IOKit"),
"system-configuration-sys" => framework!("SystemConfiguration"),
"tikv-jemalloc-sys" => build!("rust-jemalloc-sys"),
"tracker-sys" => build!("tracker"),
"trash" => framework!("Foundation"),
"vte4-sys" => build!("vte-gtk4"),
"wayland-sys" => build!("wayland"; linux),
"webbrowser" => framework!("CoreServices"),
"webkit2gtk-sys" => build!("webkitgtk"),
"webkit2gtk-webextension-sys" => build!("webkitgtk"),
"webkit2gtk5-sys" => build!("webkitgtk_5_0"),
"webkit2gtk5-webextension-sys" => build!("webkitgtk_5_0"),
"webkit6-sys" => build!("webkitgtk_6_0"),
"wgpu-hal" => framework!("QuartzCore"),
"whoami" => framework!("CoreFoundation", "SystemConfiguration"),
"wholesym" => framework!("CoreServices"),
"wireplumber" => build!("wireplumber"),
"x11" => {
for feat in resolve.features(pkg) {
Expand Down
8 changes: 0 additions & 8 deletions src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,6 @@ macro_rules! input_macros {
};
}

// apple frameworks
#[allow(unused_macros)]
macro_rules! framework {
($_($input:literal),+) => {
build!($_(concat!("darwin.apple_sdk.frameworks.", $input)),+; darwin)
};
}

// gstreamer libraries
#[allow(unused_macros)]
macro_rules! gst {
Expand Down