diff --git a/pkgs/by-name/ki/kitty/libxkbcommon-runtime-path.patch b/pkgs/by-name/ki/kitty/libxkbcommon-runtime-path.patch index aa7c5cedaeb1..f949ef87fa25 100644 --- a/pkgs/by-name/ki/kitty/libxkbcommon-runtime-path.patch +++ b/pkgs/by-name/ki/kitty/libxkbcommon-runtime-path.patch @@ -1,23 +1,23 @@ -diff --git a/kitty/key_names.py b/kitty/key_names.py -index 1c4ce3487..00d767d45 100644 ---- a/kitty/key_names.py -+++ b/kitty/key_names.py -@@ -59,17 +59,7 @@ if is_macos: - else: +diff --git i/kitty/key_names.py w/kitty/key_names.py +index d496339..2a1d9bc 100644 +--- i/kitty/key_names.py ++++ w/kitty/key_names.py +@@ -67,17 +67,7 @@ def get_key_name_lookup() -> LookupFunc: def load_libxkb_lookup() -> LookupFunc: import ctypes + - for suffix in ('.0', ''): - with suppress(Exception): - lib = ctypes.CDLL(f'libxkbcommon.so{suffix}') - break - else: - from ctypes.util import find_library +- - lname = find_library('xkbcommon') - if lname is None: - raise RuntimeError('Failed to find libxkbcommon') - lib = ctypes.CDLL(lname) -- + lib = ctypes.CDLL('@libxkbcommon@') + f = lib.xkb_keysym_from_name f.argtypes = [ctypes.c_char_p, ctypes.c_int] - f.restype = ctypes.c_int diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index 74978c0f6060..dbabc74eb17b 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -46,26 +46,42 @@ makeBinaryWrapper, darwin, cairo, + shader-slang, }: +let + shader-slang' = shader-slang.overrideAttrs ( + finalAttrs: previousAttrs: { + version = "2026.18"; + src = fetchFromGitHub { + owner = "shader-slang"; + repo = "slang"; + tag = "v${finalAttrs.version}"; + hash = "sha256-GlXTDfC6BLENmrzBceJGZIP4FU5ItqtyoxmbnFZ5fdQ="; + fetchSubmodules = true; + }; + cmakeFlags = previousAttrs.cmakeFlags ++ [ (lib.cmakeBool "SLANG_ENABLE_DXIL" false) ]; + } + ); +in with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.48.2"; + version = "0.49.1"; pyproject = false; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-qNgVPpvMm8Y/nbBjVvWVuZ954ZXIuWmXhldP3w8MBhU="; + hash = "sha256-YVjTfJnsNEBjcHWQCq2nJBFPvLg7RqQcyWjgR4ijUqc="; }; goModules = (buildGo126Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-BZudfNfREwNrgalaimC5Lp+UIdFS+jHFLl9mEXcHYMI="; + vendorHash = "sha256-urQMf5lGYPgS65VjGw0pi/ZM6CETtGWfi/kvVDAkIoc="; }).goModules; buildInputs = [ @@ -108,11 +124,13 @@ buildPythonApplication rec { sphinx furo sphinx-copybutton + sphinx-design sphinxext-opengraph sphinx-inline-tabs go_1_26 fontconfig makeBinaryWrapper + shader-slang' ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ imagemagick @@ -294,6 +312,7 @@ buildPythonApplication rec { lib.makeBinPath [ imagemagick ncurses.dev + shader-slang' ] }"