git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #87395 from Luflosi/update/kitty

kitty: 0.17.3 -> 0.17.4

commit8814a112ac57bf93c28fdcd3589110d4b6d42412 authorMaximilian Bosch <maximilian@mbosch.me> dateSun 10 May 2020, 23:26 (7 years ago) parent4cc76bffabf511
2 files changed+25−19
pkgs/applications/misc/kitty/default.nix+2−2 pkgs/applications/misc/kitty/library-paths.patch+23−17
pkgs/applications/misc/kitty/default.nix+2−2
@@ -20,14 +20,14 @@
2020with python3Packages;
2121buildPythonApplication rec {
2222 pname = "kitty";
23− version = "0.17.3";
23+ version = "0.17.4";
2424 format = "other";
2525
2626 src = fetchFromGitHub {
2727 owner = "kovidgoyal";
2828 repo = "kitty";
2929 rev = "v${version}";
30− sha256 = "1nx8gjavq8kc656ayh3wign1f68b46jbnmy8zyks25wg0p9gid8l";
30+ sha256 = "1rbyj84y8r6h7qd6w7cw58v2abspippignj458ihv2m26i4als2x";
3131 };
3232
3333 buildInputs = [
pkgs/applications/misc/kitty/library-paths.patch+23−17
@@ -12,21 +12,27 @@
1212
1313--- a/kitty/desktop.c
1414+++ b/kitty/desktop.c
15−@@ -30,7 +30,7 @@
16− static PyObject*
17− init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) {
18− static bool done = false;
19−- static const char* libname = "libstartup-notification-1.so";
20−+ static const char* libname = "@libstartup_notification@";
21− // some installs are missing the .so symlink, so try the full name
22− static const char* libname2 = "libstartup-notification-1.so.0";
23− static const char* libname3 = "libstartup-notification-1.so.0.0.0";
24−@@ -105,7 +105,7 @@ load_libcanberra_functions(void) {
15+@@ -34,10 +34,7 @@ init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) {
16+ done = true;
2517
26− static void
27− load_libcanberra(void) {
28−- static const char* libname = "libcanberra.so";
29−+ static const char* libname = "@libcanberra@";
30− // some installs are missing the .so symlink, so try the full name
31− static const char* libname2 = "libcanberra.so.0";
32− static const char* libname3 = "libcanberra.so.0.2.5";
18+ const char* libnames[] = {
19+- "libstartup-notification-1.so",
20+- // some installs are missing the .so symlink, so try the full name
21+- "libstartup-notification-1.so.0",
22+- "libstartup-notification-1.so.0.0.0",
23++ "@libstartup_notification@",
24+ NULL
25+ };
26+ for (int i = 0; libnames[i]; i++) {
27+@@ -113,10 +110,7 @@ load_libcanberra(void) {
28+ if (done) return;
29+ done = true;
30+ const char* libnames[] = {
31+- "libcanberra.so",
32+- // some installs are missing the .so symlink, so try the full name
33+- "libcanberra.so.0",
34+- "libcanberra.so.0.2.5",
35++ "@libcanberra@",
36+ NULL
37+ };
38+ for (int i = 0; libnames[i]; i++) {