JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64909d8216
nixpkgs/pkgs/applications/misc/kitty/fix-paths.patch

28 lines
1.0 KiB
Diff
Raw Normal View History

kitty: fix locating libstartup-notification-1 Startup notification doesn't work in recent versions of Kitty: > Traceback (most recent call last): > File "/nix/store/3a3b0xd952gp8jw70k5kh3a4zhgzf0p7-kitty-0.12.3/bin/../lib/kitty/kitty/utils.py", line 216, in init_startup_notification > return init_startup_notification_x11(window_handle, startup_id) > File "/nix/store/3a3b0xd952gp8jw70k5kh3a4zhgzf0p7-kitty-0.12.3/bin/../lib/kitty/kitty/utils.py", line 201, in init_startup_notification_x11 > return init_x11_startup_notification(display, window_handle, sid) > OSError: Failed to load libstartup-notification-1.so with error: libstartup-notification-1.so: cannot open shared object file: No such file or directory Apparently dispatching of startup notification has been moved to a C binding in kitty 0.6.0 [1] so the substituion had to be modified to reflect that. Without this fix Kitty still works except that window managers which depend on startup notifications to be fired (e.g. Awesome) cannot apply special placement rules. The substitution mechanism is also changed to use a patch file to detect this kind of mistakes in the future. [1]: https://github.com/kovidgoyal/kitty/commit/b08f4ab5937199187581aa20e3a7aba7b2a34ac6
2018-10-20 15:06:03 +01:00
--- 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@";
kitty: Adapt fix-paths.patch to source changes
2019-01-06 20:35:18 +00:00
// some installs are missing the .so symlink, so try the full name
static const char* libname2 = "libstartup-notification-1.so.0";
kitty: fix locating libstartup-notification-1 Startup notification doesn't work in recent versions of Kitty: > Traceback (most recent call last): > File "/nix/store/3a3b0xd952gp8jw70k5kh3a4zhgzf0p7-kitty-0.12.3/bin/../lib/kitty/kitty/utils.py", line 216, in init_startup_notification > return init_startup_notification_x11(window_handle, startup_id) > File "/nix/store/3a3b0xd952gp8jw70k5kh3a4zhgzf0p7-kitty-0.12.3/bin/../lib/kitty/kitty/utils.py", line 201, in init_startup_notification_x11 > return init_x11_startup_notification(display, window_handle, sid) > OSError: Failed to load libstartup-notification-1.so with error: libstartup-notification-1.so: cannot open shared object file: No such file or directory Apparently dispatching of startup notification has been moved to a C binding in kitty 0.6.0 [1] so the substituion had to be modified to reflect that. Without this fix Kitty still works except that window managers which depend on startup notifications to be fired (e.g. Awesome) cannot apply special placement rules. The substitution mechanism is also changed to use a patch file to detect this kind of mistakes in the future. [1]: https://github.com/kovidgoyal/kitty/commit/b08f4ab5937199187581aa20e3a7aba7b2a34ac6
2018-10-20 15:06:03 +01:00
kitty: fixing environment variable substituition in docs/Makefile The previous substitutution only worked by accident as make requires environment variables to be enclosed in curly brackets as shown in this excerpt from the build output: > PYTHONPATH=YTHONPATH:.. HOME=MPDIR/nowhere sphinx-build -M html "." "_build" -T The substituition is moved to the existing patch file to simplify the builder expression.
2018-10-20 19:40:20 +01:00
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,7 +3,7 @@
kitty: 0.13.3 -> 0.14.0
2019-05-25 14:17:27 +01:00
# Patching is needed here for the following reason:
kitty: fixing environment variable substituition in docs/Makefile The previous substitutution only worked by accident as make requires environment variables to be enclosed in curly brackets as shown in this excerpt from the build output: > PYTHONPATH=YTHONPATH:.. HOME=MPDIR/nowhere sphinx-build -M html "." "_build" -T The substituition is moved to the existing patch file to simplify the builder expression.
2018-10-20 19:40:20 +01:00
# * importing the `constants` package from Kitty has a side effect that it
# creates the user configuration directory. This package gets imported
# while sphinx scans the code for documentation strings.
#
kitty: 0.13.3 -> 0.14.0
2019-05-25 14:17:27 +01:00
kitty: fixing environment variable substituition in docs/Makefile The previous substitutution only worked by accident as make requires environment variables to be enclosed in curly brackets as shown in this excerpt from the build output: > PYTHONPATH=YTHONPATH:.. HOME=MPDIR/nowhere sphinx-build -M html "." "_build" -T The substituition is moved to the existing patch file to simplify the builder expression.
2018-10-20 19:40:20 +01:00
# You can set these variables from the command line.
kitty: 0.13.3 -> 0.14.0
2019-05-25 14:17:27 +01:00
SPHINXOPTS = -j auto -T $(FAIL_WARN)
-SPHINXBUILD = sphinx-build
kitty: fixing environment variable substituition in docs/Makefile The previous substitutution only worked by accident as make requires environment variables to be enclosed in curly brackets as shown in this excerpt from the build output: > PYTHONPATH=YTHONPATH:.. HOME=MPDIR/nowhere sphinx-build -M html "." "_build" -T The substituition is moved to the existing patch file to simplify the builder expression.
2018-10-20 19:40:20 +01:00
+SPHINXBUILD = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build
SPHINXPROJ = kitty
SOURCEDIR = .
BUILDDIR = _build
Reference in New Issue Copy Permalink