From 3126ef6a4084ef9670276ac76a0a61ee6a2d9ee5 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Thu, 29 Dec 2022 10:09:17 -0500 Subject: [PATCH] kitty: use apple_sdk_11 and mark as broken on x86_64-darwin --- pkgs/applications/terminal-emulators/kitty/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index a8582cbdd23d..e1a3f00255eb 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -7,12 +7,13 @@ , openssl , installShellFiles , dbus -, darwin , Cocoa , CoreGraphics , Foundation , IOKit , Kernel +, UniformTypeIdentifiers +, UserNotifications , OpenGL , libcanberra , libicns @@ -51,11 +52,11 @@ buildPythonApplication rec { IOKit Kernel OpenGL + UniformTypeIdentifiers + UserNotifications libpng python3 zlib - ] ++ lib.optionals (stdenv.isDarwin && (builtins.hasAttr "UserNotifications" darwin.apple_sdk.frameworks)) [ - darwin.apple_sdk.frameworks.UserNotifications ] ++ lib.optionals stdenv.isLinux [ fontconfig libunistring libcanberra libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext @@ -218,6 +219,7 @@ buildPythonApplication rec { license = licenses.gpl3Only; changelog = "https://sw.kovidgoyal.net/kitty/changelog/"; platforms = platforms.darwin ++ platforms.linux; + broken = (stdenv.isDarwin && stdenv.isx86_64); maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d05df3751808..9485ee5eaad7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1884,9 +1884,9 @@ with pkgs; kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { }; - kitty = callPackage ../applications/terminal-emulators/kitty { + kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; - inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel UniformTypeIdentifiers OpenGL UserNotifications; }; kitty-themes = callPackage ../misc/kitty-themes {};