about summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorWill Dietz <github@wdtz.org>2018-07-06 11:32:02 -0500
committerGitHub <noreply@github.com>2018-07-06 11:32:02 -0500
commit7835d7c74f369ff4f435f4276d4328d26ce34b0d (patch)
treefb349601020f4c7a076fae352c295893b7a912a8 /pkgs/applications/misc
parent140f384ff78c96e2e2d617417dab2730451dfa4b (diff)
parent481e61fad8b806a48aa30d736344cae4be88dfa6 (diff)
downloadnixlib-7835d7c74f369ff4f435f4276d4328d26ce34b0d.tar
nixlib-7835d7c74f369ff4f435f4276d4328d26ce34b0d.tar.gz
nixlib-7835d7c74f369ff4f435f4276d4328d26ce34b0d.tar.bz2
nixlib-7835d7c74f369ff4f435f4276d4328d26ce34b0d.tar.lz
nixlib-7835d7c74f369ff4f435f4276d4328d26ce34b0d.tar.xz
nixlib-7835d7c74f369ff4f435f4276d4328d26ce34b0d.tar.zst
nixlib-7835d7c74f369ff4f435f4276d4328d26ce34b0d.zip
Merge pull request #43076 from dtzWill/update/kitty-0.11.2
kitty: 0.10.1 -> 0.11.2
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/kitty/default.nix15
1 files 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 = ''