mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
Merge pull request #208251 from adamcstephens/kitty/0.26.5
Closes https://github.com/NixOS/nixpkgs/pull/194543
This commit is contained in:
commit
9c118a72f5
@ -7,12 +7,13 @@
|
|||||||
, openssl
|
, openssl
|
||||||
, installShellFiles
|
, installShellFiles
|
||||||
, dbus
|
, dbus
|
||||||
, darwin
|
|
||||||
, Cocoa
|
, Cocoa
|
||||||
, CoreGraphics
|
, CoreGraphics
|
||||||
, Foundation
|
, Foundation
|
||||||
, IOKit
|
, IOKit
|
||||||
, Kernel
|
, Kernel
|
||||||
|
, UniformTypeIdentifiers
|
||||||
|
, UserNotifications
|
||||||
, OpenGL
|
, OpenGL
|
||||||
, libcanberra
|
, libcanberra
|
||||||
, libicns
|
, libicns
|
||||||
@ -28,14 +29,14 @@
|
|||||||
with python3Packages;
|
with python3Packages;
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "kitty";
|
pname = "kitty";
|
||||||
version = "0.26.2";
|
version = "0.26.5";
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kovidgoyal";
|
owner = "kovidgoyal";
|
||||||
repo = "kitty";
|
repo = "kitty";
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-IqXRkKzOfqWolH/534nmM2R/69olhFOk6wbbF4ifRd0=";
|
sha256 = "sha256-UloBlV26HnkvbzP/NynlPI77z09MBEVgtrg5SeTmwB4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
@ -51,11 +52,11 @@ buildPythonApplication rec {
|
|||||||
IOKit
|
IOKit
|
||||||
Kernel
|
Kernel
|
||||||
OpenGL
|
OpenGL
|
||||||
|
UniformTypeIdentifiers
|
||||||
|
UserNotifications
|
||||||
libpng
|
libpng
|
||||||
python3
|
python3
|
||||||
zlib
|
zlib
|
||||||
] ++ lib.optionals (stdenv.isDarwin && (builtins.hasAttr "UserNotifications" darwin.apple_sdk.frameworks)) [
|
|
||||||
darwin.apple_sdk.frameworks.UserNotifications
|
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
fontconfig libunistring libcanberra libX11
|
fontconfig libunistring libcanberra libX11
|
||||||
libXrandr libXinerama libXcursor libxkbcommon libXi libXext
|
libXrandr libXinerama libXcursor libxkbcommon libXi libXext
|
||||||
@ -218,6 +219,7 @@ buildPythonApplication rec {
|
|||||||
license = licenses.gpl3Only;
|
license = licenses.gpl3Only;
|
||||||
changelog = "https://sw.kovidgoyal.net/kitty/changelog/";
|
changelog = "https://sw.kovidgoyal.net/kitty/changelog/";
|
||||||
platforms = platforms.darwin ++ platforms.linux;
|
platforms = platforms.darwin ++ platforms.linux;
|
||||||
maintainers = with maintainers; [ tex rvolosatovs Luflosi ];
|
broken = (stdenv.isDarwin && stdenv.isx86_64);
|
||||||
|
maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -2341,9 +2341,9 @@ with pkgs;
|
|||||||
|
|
||||||
kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { };
|
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; };
|
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 {};
|
kitty-themes = callPackage ../misc/kitty-themes {};
|
||||||
|
Loading…
Reference in New Issue
Block a user