From 481e61fad8b806a48aa30d736344cae4be88dfa6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 5 Jul 2018 10:57:40 -0500 Subject: [PATCH] kitty: 0.10.1 -> 0.11.2 --- pkgs/applications/misc/kitty/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 99c8b87bf4f5..38c2494c9f7d 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, - libxkbcommon, libXi, libXext }: + libxkbcommon, libXi, libXext, wayland-protocols, wayland, + which +}: with python3Packages; buildPythonApplication rec { - version = "0.10.1"; + version = "0.11.2"; name = "kitty-${version}"; format = "other"; @@ -13,19 +15,24 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1xwrrj0g70hh8zsjbd05x0js776xlf7c6mdsmrqlw4y7jfnlgl45"; + sha256 = "0vmxgyxrgaqijwd51ldd8pkz7jn9hdcfib1dqr0ai614286v69hw"; }; buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext + wayland-protocols wayland ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig which sphinx ]; postPatch = '' substituteInPlace kitty/utils.py \ --replace "find_library('startup-notification-1')" "'${libstartup_notification}/lib/libstartup-notification-1.so'" + + substituteInPlace docs/Makefile \ + --replace 'python3 .. +launch $(shell which sphinx-build)' \ + 'PYTHONPATH=$PYTHONPATH:.. HOME=$TMPDIR/nowhere $(shell which sphinx-build)' ''; buildPhase = ''