Skip to content

kitty: 0.23.1 -> 0.24.1 #153999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
teto merged 4 commits into from
Jan 16, 2022
Merged

kitty: 0.23.1 -> 0.24.1 #153999

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f7a433
kitty: combine installPhase and postInstall phase
Luflosi Jan 7, 2022
3bb443d
kitty: 0.23.1 -> 0.24.1
Luflosi Jan 7, 2022
aa1932e
kitty: copy shell integration files into separate output
Luflosi Jan 7, 2022
5025d2f
kitty: Fix compilation on apple sdk 11
azuwis Sep 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions pkgs/applications/terminal-emulators/kitty/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor,
libxkbcommon, libXi, libXext, wayland-protocols, wayland,
lcms2,
librsync,
installShellFiles,
dbus,
darwin,
Cocoa,
CoreGraphics,
Foundation,
Expand All @@ -21,20 +23,21 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.23.1";
version = "0.24.1";
format = "other";

src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "sha256-2RwDU6EOJWF0u2ikJFg9U2yqSXergDkJH3h2i+QJ7G4=";
sha256 = "sha256-WPkyub7CwNXRksUmqiZeznnSqEPFpyHTeFLQ+D4Fb5c=";
};

buildInputs = [
harfbuzz
ncurses
lcms2
librsync
] ++ lib.optionals stdenv.isDarwin [
Cocoa
CoreGraphics
Expand All @@ -45,6 +48,8 @@ buildPythonApplication rec {
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 All @@ -67,26 +72,31 @@ buildPythonApplication rec {

propagatedBuildInputs = lib.optional stdenv.isLinux libGL;

outputs = [ "out" "terminfo" ];
outputs = [ "out" "terminfo" "shell_integration" ];

# Causes build failure due to warning
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";

dontConfigure = true;

buildPhase = ''
buildPhase = let
commonOptions = ''
--update-check-interval=0 \
--shell-integration=enabled\ no-rc
'';
in ''
runHook preBuild
${if stdenv.isDarwin then ''
${python.interpreter} setup.py kitty.app \
--update-check-interval=0 \
--disable-link-time-optimization
--disable-link-time-optimization \
${commonOptions}
make man
'' else ''
${python.interpreter} setup.py linux-package \
--update-check-interval=0 \
--egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \
--startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \
--canberra-library='${libcanberra}/lib/libcanberra.so'
--canberra-library='${libcanberra}/lib/libcanberra.so' \
${commonOptions}
''}
runHook postBuild
'';
Expand Down Expand Up @@ -125,10 +135,7 @@ buildPythonApplication rec {
--bash <("$out/bin/kitty" + complete setup bash) \
--fish <("$out/bin/kitty" + complete setup fish) \
--zsh <("$out/bin/kitty" + complete setup zsh)
runHook postInstall
'';

postInstall = ''
terminfo_src=${if stdenv.isDarwin then
''"$out/Applications/kitty.app/Contents/Resources/terminfo"''
else
Expand All @@ -139,6 +146,10 @@ buildPythonApplication rec {

mkdir -p $out/nix-support
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages

cp -r 'shell-integration' "$shell_integration"

runHook postInstall
'';

meta = with lib; {
Expand Down