diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/kitty/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/kitty/default.nix | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/applications/misc/kitty/default.nix b/nixpkgs/pkgs/applications/misc/kitty/default.nix index 80cf90ced16..65d7df72489 100644 --- a/nixpkgs/pkgs/applications/misc/kitty/default.nix +++ b/nixpkgs/pkgs/applications/misc/kitty/default.nix @@ -3,7 +3,7 @@ libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, installShellFiles, - which, dbus, + dbus, Cocoa, CoreGraphics, Foundation, @@ -20,14 +20,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.17.4"; + version = "0.18.3"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1rbyj84y8r6h7qd6w7cw58v2abspippignj458ihv2m26i4als2x"; + sha256 = "0y05bw6d1m79dyhm7b6lk6wy82pmy2s9jhf01kf8gr2p0rjjp9yl"; }; buildInputs = [ @@ -50,7 +50,7 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - pkgconfig which sphinx ncurses + pkgconfig sphinx ncurses ] ++ stdenv.lib.optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. @@ -63,13 +63,6 @@ buildPythonApplication rec { patches = [ ./fix-paths.patch - ] ++ stdenv.lib.optionals stdenv.isLinux [ - (substituteAll { - src = ./library-paths.patch; - libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so"; - libcanberra = "${libcanberra}/lib/libcanberra.so"; - libEGL = "${stdenv.lib.getLib libGL}/lib/libEGL.so.1"; - }) ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-lto.patch ]; @@ -77,13 +70,31 @@ buildPythonApplication rec { # Causes build failure due to warning hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + dontConfigure = true; + buildPhase = if stdenv.isDarwin then '' ${python.interpreter} setup.py kitty.app --update-check-interval=0 make man '' else '' - ${python.interpreter} setup.py linux-package --update-check-interval=0 + ${python.interpreter} setup.py linux-package \ + --update-check-interval=0 \ + --egl-library='${stdenv.lib.getLib libGL}/lib/libEGL.so.1' \ + --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ + --canberra-library='${libcanberra}/lib/libcanberra.so' ''; + checkInputs = [ pillow ]; + + checkPhase = + let buildBinPath = + if stdenv.isDarwin + then "kitty.app/Contents/MacOS" + else "linux-package/bin"; + in + '' + env PATH="${buildBinPath}:$PATH" ${python.interpreter} test.py + ''; + installPhase = '' runHook preInstall mkdir -p $out @@ -100,8 +111,6 @@ buildPythonApplication rec { wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" runHook postInstall - # ZSH completions need to be invoked with `source`: - # https://github.com/kovidgoyal/kitty/blob/8ceb941051b89b7c50850778634f0b6137aa5e6e/docs/index.rst#zsh mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} "$out/bin/kitty" + complete setup fish > "$out/share/fish/vendor_completions.d/kitty.fish" "$out/bin/kitty" + complete setup bash > "$out/share/bash-completion/completions/kitty.bash" @@ -125,7 +134,8 @@ buildPythonApplication rec { homepage = "https://github.com/kovidgoyal/kitty"; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3; + changelog = "https://sw.kovidgoyal.net/kitty/changelog.html"; platforms = platforms.darwin ++ platforms.linux; - maintainers = with maintainers; [ tex rvolosatovs ma27 Luflosi ]; + maintainers = with maintainers; [ tex rvolosatovs Luflosi ]; }; } |