Skip to content

Commit

Permalink
alacritty: use new darwin SDK pattern
Browse files Browse the repository at this point in the history
With the hope also that this unbreaks alacritty on x86_64-darwin, which
currently fails due to not finding _NSPasteboardTypeFileURL symbol.
  • Loading branch information
tjni committed Nov 4, 2024
1 parent ec9d16e commit 0ea31d1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
17 changes: 2 additions & 15 deletions pkgs/applications/terminal-emulators/alacritty/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,7 @@
, wayland
, xdg-utils

# Darwin Frameworks
, AppKit
, CoreGraphics
, CoreServices
, CoreText
, Foundation
, libiconv
, OpenGL
, apple-sdk_11
}:
let
rpathLibs = [
Expand Down Expand Up @@ -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" ];
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down

0 comments on commit 0ea31d1

Please sign in to comment.