From 5359c185d8411028796f3f9e78f26da2f6203320 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 4 Oct 2020 18:42:36 +0200 Subject: [PATCH] kitty: 0.18.3 -> 0.19.0 https://github.com/kovidgoyal/kitty/releases/tag/v0.19.0 This release requires a new dependency. There is now a flag for the build system to disable LTO. This removes the need for a patch. --- pkgs/applications/misc/kitty/default.nix | 12 +++++++----- pkgs/applications/misc/kitty/no-lto.patch | 13 ------------- 2 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 pkgs/applications/misc/kitty/no-lto.patch diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 362a5285685e..bc488ac13cae 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -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,8 +65,6 @@ buildPythonApplication rec { patches = [ ./fix-paths.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - ./no-lto.patch ]; # Causes build failure due to warning @@ -73,7 +73,9 @@ buildPythonApplication rec { 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 \ diff --git a/pkgs/applications/misc/kitty/no-lto.patch b/pkgs/applications/misc/kitty/no-lto.patch deleted file mode 100644 index b1f38f9fd49f..000000000000 --- a/pkgs/applications/misc/kitty/no-lto.patch +++ /dev/null @@ -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')