diff options
| -rw-r--r-- | pkgs/applications/misc/kitty/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/misc/kitty/library-paths.patch | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index e4281ede89f..dbb4f5138c3 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -70,6 +70,7 @@ buildPythonApplication rec { src = ./library-paths.patch; libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so"; libcanberra = "${libcanberra}/lib/libcanberra.so"; + libEGL = "${stdenv.lib.getLib libGL}/lib/libEGL.so.1"; }) ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-lto.patch @@ -77,10 +78,6 @@ buildPythonApplication rec { ./png2icns.patch ]; - preConfigure = stdenv.lib.optional (!stdenv.isDarwin) '' - substituteInPlace glfw/egl_context.c --replace "libEGL.so.1" "${stdenv.lib.getLib libGL}/lib/libEGL.so.1" - ''; - buildPhase = if stdenv.isDarwin then '' ${python.interpreter} setup.py kitty.app --update-check-interval=0 '' else '' diff --git a/pkgs/applications/misc/kitty/library-paths.patch b/pkgs/applications/misc/kitty/library-paths.patch index 93c69b28484..5f8daacc3c2 100644 --- a/pkgs/applications/misc/kitty/library-paths.patch +++ b/pkgs/applications/misc/kitty/library-paths.patch @@ -1,3 +1,15 @@ +--- a/glfw/egl_context.c ++++ b/glfw/egl_context.c +@@ -314,7 +314,7 @@ bool _glfwInitEGL(void) + #elif defined(__CYGWIN__) + "libEGL-1.so", + #else +- "libEGL.so.1", ++ "@libEGL@", + #endif + NULL + }; + --- a/kitty/desktop.c +++ b/kitty/desktop.c @@ -30,7 +30,7 @@ |