Merge pull request #99577 from Luflosi/update/kitty

kitty: 0.18.3 -> 0.19.0
This commit is contained in:
Daniël de Kok 2020-10-05 08:21:39 +02:00 committed by GitHub
commit f4e6fecebc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 19 deletions

View file

@ -2,6 +2,7 @@
harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel,
libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor,
libxkbcommon, libXi, libXext, wayland-protocols, wayland,
lcms2,
installShellFiles,
dbus,
Cocoa,
@ -20,19 +21,20 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.18.3";
version = "0.19.0";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "0y05bw6d1m79dyhm7b6lk6wy82pmy2s9jhf01kf8gr2p0rjjp9yl";
sha256 = "0j2ci6acfl21mm111iis0aa5jp1hl1fnlvlhhfps9j5w4ba8sy7z";
};
buildInputs = [
harfbuzz
ncurses
lcms2
] ++ stdenv.lib.optionals stdenv.isDarwin [
Cocoa
CoreGraphics
@ -63,17 +65,17 @@ buildPythonApplication rec {
patches = [
./fix-paths.patch
] ++ stdenv.lib.optionals stdenv.isDarwin [
./no-lto.patch
];
# Causes build failure due to warning
hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow";
hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "strictoverflow";
dontConfigure = true;
buildPhase = if stdenv.isDarwin then ''
${python.interpreter} setup.py kitty.app --update-check-interval=0
${python.interpreter} setup.py kitty.app \
--update-check-interval=0 \
--disable-link-time-optimization
make man
'' else ''
${python.interpreter} setup.py linux-package \

View file

@ -1,13 +0,0 @@
--- a/setup.py
+++ b/setup.py
@@ -287,10 +287,6 @@ def init_env(
cppflags += shlex.split(os.environ.get('CPPFLAGS', ''))
cflags += shlex.split(os.environ.get('CFLAGS', ''))
ldflags += shlex.split(os.environ.get('LDFLAGS', ''))
- if not debug and not sanitize:
- # See https://github.com/google/sanitizers/issues/647
- cflags.append('-flto')
- ldflags.append('-flto')
if profile:
cppflags.append('-DWITH_PROFILER')