Skip to content

Commit

Permalink
kitty: use apple_sdk_11 and mark as broken on x86_64-darwin
Browse files Browse the repository at this point in the history
  • Loading branch information
@adamcstephens
adamcstephens committed Dec 30, 2022
1 parent da48047 commit 3126ef6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions pkgs/applications/terminal-emulators/kitty/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
, openssl
, installShellFiles
, dbus
, darwin
, Cocoa
, CoreGraphics
, Foundation
, IOKit
, Kernel
, UniformTypeIdentifiers
, UserNotifications
, OpenGL
, libcanberra
, libicns
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 ];
};
}
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};
Expand Down

5 comments on commit 3126ef6

@dominikb1888
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any context or discussion to this change?

@adamcstephens
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi,

SDK 11 is required per upstream issue linked in the PR. There was also some discussion in #194543.

My understanding was that x86_64-darwin could not be used with SDK 11, but perhaps that was mistaken. I'd be happy to unbreak this for x86_64 if it will build, but I unfortunately don't have a system to test it on.

@dominikb1888
Copy link

@dominikb1888 dominikb1888 commented on 3126ef6 Jan 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adamcstephens: Thanks for the quick reply! This helps quite a bit. I'll see, if I can do something on my end. Seems like SDK 11 is available on x86_64: #176661

@i-am-logger
Copy link
Contributor

@i-am-logger i-am-logger commented on 3126ef6 Jan 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I get this error:

       last 10 log lines:
       >     run_test = <function ShellIntegration.test_bash_integration.<locals>.run_test at 0x7ffff55db400>
       >     self = <kitty_tests.shell_integration.ShellIntegration testMethod=test_bash_integration>
       >     setup_env = <function ShellIntegration.test_bash_integration.<locals>.setup_env at 0x7ffff55dbf40>
       > AssertionError: None != 'a\n `b` c\n$d' : Screen contents: '[bash.bashrc]\nclone-in-kitty\nline1\nprompt> clone-in-kitty\nline1\nprompt> '
       >
       > ----------------------------------------------------------------------
       > Ran 140 tests in 42.593s
       >
       > FAILED (failures=1, skipped=3)
       > make: *** [Makefile:16: test] Error 1
       For full logs, run 'nix log /nix/store/dmdg0nzizw56p7j64vr67yc741cw22ph-kitty-0.26.5.drv'.```

@adamcstephens
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@realsnick That error was fixed in #211135

Please sign in to comment.