From 3a150b7562fa255164cc1bc0344bb664a1b4485d Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 16 Jan 2023 11:23:07 -0800 Subject: [PATCH] kitty: unbreak on `x86_64-darwin` --- .../terminal-emulators/kitty/default.nix | 13 ++++--------- pkgs/top-level/all-packages.nix | 8 +++++++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index e1a3f00255eb..69e6e270654a 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -7,14 +7,11 @@ , openssl , installShellFiles , dbus +, Libsystem , Cocoa -, CoreGraphics -, Foundation -, IOKit , Kernel , UniformTypeIdentifiers , UserNotifications -, OpenGL , libcanberra , libicns , libpng @@ -47,16 +44,14 @@ buildPythonApplication rec { openssl.dev ] ++ lib.optionals stdenv.isDarwin [ Cocoa - CoreGraphics - Foundation - IOKit Kernel - OpenGL UniformTypeIdentifiers UserNotifications libpng python3 zlib + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + Libsystem ] ++ lib.optionals stdenv.isLinux [ fontconfig libunistring libcanberra libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext @@ -110,6 +105,7 @@ buildPythonApplication rec { ''; in '' runHook preBuild + ${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } ${if stdenv.isDarwin then '' ${python.interpreter} setup.py build ${darwinOptions} make docs @@ -219,7 +215,6 @@ 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 71618a9504e1..961d5cb537cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2366,7 +2366,13 @@ with pkgs; kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel UniformTypeIdentifiers OpenGL UserNotifications; + inherit (darwin.apple_sdk_11_0) Libsystem; + inherit (darwin.apple_sdk_11_0.frameworks) + Cocoa + Kernel + UniformTypeIdentifiers + UserNotifications + ; }; kitty-themes = callPackage ../misc/kitty-themes {};