public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65546 from rvolosatovs/update/kitty 

kitty: 0.14.2 -> 0.14.3
This commit is contained in:
Robin Gloster 2019-07-29 16:18:46 +00:00 committed by GitHub
parent cf979f246e 0283abb4e8
commit 31358a824b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/misc/kitty/default.nix
View File

@ -9,6 +9,7 @@
IOKit, IOKit,
Kernel, Kernel,
OpenGL, OpenGL,
libcanberra,
libicns, libicns,
libpng, libpng,
librsvg, librsvg,
@ -20,18 +21,19 @@
with python3Packages; with python3Packages;
buildPythonApplication rec { buildPythonApplication rec {
pname = "kitty"; pname = "kitty";
version = "0.14.2"; version = "0.14.3";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kovidgoyal"; owner = "kovidgoyal";
repo = "kitty"; repo = "kitty";
rev = "v${version}"; rev = "v${version}";
sha256 = "15iv3k7iryf10n8n67d37x24pzcarq97a3dr42lbld00k1lx19az"; sha256 = "0wi6b6b1nyp16rcpcghk6by62wy6qsamv1xdymyn0zbqgd8h9n6b";
}; };
buildInputs = [ buildInputs = [
ncurses harfbuzz harfbuzz
ncurses
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [
Cocoa Cocoa
CoreGraphics CoreGraphics
@ -43,7 +45,7 @@ buildPythonApplication rec {
python3 python3
zlib zlib
] ++ stdenv.lib.optionals stdenv.isLinux [ ] ++ stdenv.lib.optionals stdenv.isLinux [
fontconfig glfw libunistring libX11 fontconfig glfw libunistring libcanberra libX11
libXrandr libXinerama libXcursor libxkbcommon libXi libXext libXrandr libXinerama libXcursor libxkbcommon libXi libXext
wayland-protocols wayland dbus wayland-protocols wayland dbus
]; ];

40
pkgs/applications/misc/kitty/png2icns.patch
View File

@ -1,19 +1,21 @@
--- a/setup.py diff -aru a/setup.py b/setup.py
+++ b/setup.py --- a/setup.py 2019-07-29 11:09:32.000000000 -0400
@@ -744,9 +744,15 @@ Categories=System;TerminalEmulator; +++ b/setup.py 2019-07-29 11:11:37.000000000 -0400
if not os.path.exists(logo_dir): @@ -784,9 +784,15 @@
raise SystemExit('The kitty logo has not been generated, you need to run logo/make.py') def create_macos_app_icon(where='Resources'):
subprocess.check_call([ logo_dir = os.path.abspath(os.path.join('logo', appname + '.iconset'))
- 'iconutil', '-c', 'icns', logo_dir, '-o', subprocess.check_call([
+ 'png2icns', - 'iconutil', '-c', 'icns', logo_dir, '-o',
os.path.join('Resources', os.path.basename(logo_dir).partition('.')[0] + '.icns') + 'png2icns',
- ]) os.path.join(where, os.path.basename(logo_dir).partition('.')[0] + '.icns')
+ ] + [os.path.join(logo_dir, logo) for logo in ( - ])
+ 'icon_128x128.png', + ] + [os.path.join(logo_dir, logo) for logo in [
+ 'icon_16x16.png', + 'icon_128x128.png',
+ 'icon_256x256.png', + 'icon_16x16.png',
+ 'icon_32x32.png', + 'icon_256x256.png',
+ 'icon_512x512.png', + 'icon_32x32.png',
+ )]) + 'icon_512x512.png',
# }}} + ]])
# }}}
def create_minimal_macos_bundle(args, where):