From 7e9d3a0a0224890e4655347e85d347cacd831ebc Mon Sep 17 00:00:00 2001 From: awwpotato Date: Tue, 22 Apr 2025 14:06:05 -0700 Subject: [PATCH] remove legacy darwin sdk see https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-legacy-frameworks --- default.nix | 23 ++++++---------- src/lang/go/deps.rs | 4 --- .../nix_init__lang__go__tests__basic.snap | 4 +-- src/lang/rust/deps.rs | 26 ------------------- src/macros.rs | 8 ------ 5 files changed, 9 insertions(+), 56 deletions(-) diff --git a/default.nix b/default.nix index df81e8e0..641b47f1 100644 --- a/default.nix +++ b/default.nix @@ -9,8 +9,6 @@ openssl, zlib, zstd, - stdenv, - darwin, spdx-license-list-data, nix, nurl, @@ -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; diff --git a/src/lang/go/deps.rs b/src/lang/go/deps.rs index 0e990706..eef85d85 100644 --- a/src/lang/go/deps.rs +++ b/src/lang/go/deps.rs @@ -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) @@ -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"); } _ => {} } diff --git a/src/lang/go/snapshots/nix_init__lang__go__tests__basic.snap b/src/lang/go/snapshots/nix_init__lang__go__tests__basic.snap index 49c8cc85..2c31273c 100644 --- a/src/lang/go/snapshots/nix_init__lang__go__tests__basic.snap +++ b/src/lang/go/snapshots/nix_init__lang__go__tests__basic.snap @@ -22,9 +22,7 @@ AllInputs { "gtk3", "gtk4", }, - darwin: { - "darwin.apple_sdk.frameworks.Cocoa", - }, + darwin: {}, aarch64_darwin: {}, x86_64_darwin: {}, linux: { diff --git a/src/lang/rust/deps.rs b/src/lang/rust/deps.rs index c887f229..a0483396 100644 --- a/src/lang/rust/deps.rs +++ b/src/lang/rust/deps.rs @@ -8,20 +8,11 @@ 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"); @@ -29,7 +20,6 @@ pub(super) fn load_rust_dependency(inputs: &mut AllInputs, resolve: &Resolve, pk "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"), @@ -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"), @@ -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" => { @@ -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"); } @@ -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"), @@ -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) { diff --git a/src/macros.rs b/src/macros.rs index dcac48fc..3d88e638 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -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 {