From 0ea31d130cc50ed6bb62e201c24705e998bd0547 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 4 Nov 2024 11:07:42 -0800 Subject: [PATCH] alacritty: use new darwin SDK pattern With the hope also that this unbreaks alacritty on x86_64-darwin, which currently fails due to not finding _NSPasteboardTypeFileURL symbol. --- .../terminal-emulators/alacritty/default.nix | 17 ++--------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 2dfee198c06e..c511619c276c 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -21,14 +21,7 @@ , wayland , xdg-utils - # Darwin Frameworks -, AppKit -, CoreGraphics -, CoreServices -, CoreText -, Foundation -, libiconv -, OpenGL +, apple-sdk_11 }: let rpathLibs = [ @@ -72,13 +65,7 @@ rustPlatform.buildRustPackage rec { buildInputs = rpathLibs ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreGraphics - CoreServices - CoreText - Foundation - libiconv - OpenGL + apple-sdk_11 ]; outputs = [ "out" "terminfo" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 233074b1838e..4ef3fcf0eb60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2791,9 +2791,7 @@ with pkgs; ### APPLICATIONS/TERMINAL-EMULATORS - alacritty = callPackage ../applications/terminal-emulators/alacritty { - inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; - }; + alacritty = callPackage ../applications/terminal-emulators/alacritty { }; blackbox-terminal = callPackage ../applications/terminal-emulators/blackbox-terminal { };