Merge pull request #87395 from Luflosi/update/kitty

kitty: 0.17.3 -> 0.17.4

2 files changed, 25 insertions, 19 deletions

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 90dd04c9d680..80cf90ced16e 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -20,14 +20,14 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.17.3";
+  version = "0.17.4";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "1nx8gjavq8kc656ayh3wign1f68b46jbnmy8zyks25wg0p9gid8l";
+    sha256 = "1rbyj84y8r6h7qd6w7cw58v2abspippignj458ihv2m26i4als2x";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/misc/kitty/library-paths.patch b/pkgs/applications/misc/kitty/library-paths.patch
index 5f8daacc3c23..608dfb80d61f 100644
--- a/pkgs/applications/misc/kitty/library-paths.patch
+++ b/pkgs/applications/misc/kitty/library-paths.patch
@@ -12,21 +12,27 @@
 
 --- a/kitty/desktop.c
 +++ b/kitty/desktop.c
-@@ -30,7 +30,7 @@
- static PyObject*
- init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) {
-     static bool done = false;
--    static const char* libname = "libstartup-notification-1.so";
-+    static const char* libname = "@libstartup_notification@";
-     // some installs are missing the .so symlink, so try the full name
-     static const char* libname2 = "libstartup-notification-1.so.0";
-     static const char* libname3 = "libstartup-notification-1.so.0.0.0";
-@@ -105,7 +105,7 @@ load_libcanberra_functions(void) {
+@@ -34,10 +34,7 @@ init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) {
+         done = true;
  
- static void
- load_libcanberra(void) {
--    static const char* libname = "libcanberra.so";
-+    static const char* libname = "@libcanberra@";
-     // some installs are missing the .so symlink, so try the full name
-     static const char* libname2 = "libcanberra.so.0";
-     static const char* libname3 = "libcanberra.so.0.2.5";
+         const char* libnames[] = {
+-            "libstartup-notification-1.so",
+-            // some installs are missing the .so symlink, so try the full name
+-            "libstartup-notification-1.so.0",
+-            "libstartup-notification-1.so.0.0.0",
++            "@libstartup_notification@",
+             NULL
+         };
+         for (int i = 0; libnames[i]; i++) {
+@@ -113,10 +110,7 @@ load_libcanberra(void) {
+     if (done) return;
+     done = true;
+     const char* libnames[] = {
+-        "libcanberra.so",
+-        // some installs are missing the .so symlink, so try the full name
+-        "libcanberra.so.0",
+-        "libcanberra.so.0.2.5",
++        "@libcanberra@",
+         NULL
+     };
+     for (int i = 0; libnames[i]; i++) {