diff options
| author | Graham Christensen <graham@grahamc.com> | 2019-07-25 13:22:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-25 13:22:03 -0700 |
| commit | 70fd697efeab4d523257da2dfbb46be80ffa0dcd (patch) | |
| tree | 0d7af902356657a17f7e4b2f73b46d37341f6af7 | |
| parent | Merge pull request #64987 from luispedro/remove_rocksdb_gflags_dep (diff) | |
| parent | kitty: fix wayland support (EGL: Library not found) (diff) | |
| download | nixpkgs-70fd697efeab4d523257da2dfbb46be80ffa0dcd.tar.gz | |
Merge pull request #65358 from josephtheengineer/master
kitty: fix wayland support (EGL: Library not found error) on swaywm
| -rw-r--r-- | pkgs/applications/misc/kitty/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 63e77ec0e672..0be9bc82187f 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -1,6 +1,6 @@ { stdenv, substituteAll, fetchFromGitHub, python3Packages, glfw, libunistring, harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, - libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, + libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, which, dbus, Cocoa, @@ -57,6 +57,8 @@ buildPythonApplication rec { optipng ]; + propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux libGL; + outputs = [ "out" "terminfo" ]; patches = [ @@ -70,6 +72,10 @@ 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 '' make app '' else '' |