mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-15 10:12:58 +00:00
2fdfa2115d
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.
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
--- 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@";
|
|
if (!done) {
|
|
done = true;
|
|
|
|
--- a/docs/Makefile
|
|
+++ b/docs/Makefile
|
|
@@ -3,7 +3,7 @@
|
|
# Patching is needed here for the following reasons:
|
|
# * `sphinx-build` in nixpkgs is not a Python file but a wrapper shell script
|
|
# * 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.
|
|
#
|
|
# You can set these variables from the command line.
|
|
SPHINXOPTS = -T $(FAIL_WARN)
|
|
-SPHINXBUILD = python3 .. +launch :sphinx-build
|
|
+SPHINXBUILD = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build
|
|
SPHINXPROJ = kitty
|
|
SOURCEDIR = .
|
|
BUILDDIR = _build
|