diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-05-13 10:14:52 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-13 10:14:52 -0400 |
commit | 73265c19c73311a600894a0d482b2a3da9a323f8 (patch) | |
tree | 8041a8053a4be3c9256b8a0a73f214732b44ff79 /pkgs | |
parent | 0fc77883e278716937376d0fdf508566a4e824bc (diff) | |
parent | 240fce7ba75e6df25855122ce0d4f93d1ea1c1be (diff) | |
download | nixlib-73265c19c73311a600894a0d482b2a3da9a323f8.tar nixlib-73265c19c73311a600894a0d482b2a3da9a323f8.tar.gz nixlib-73265c19c73311a600894a0d482b2a3da9a323f8.tar.bz2 nixlib-73265c19c73311a600894a0d482b2a3da9a323f8.tar.lz nixlib-73265c19c73311a600894a0d482b2a3da9a323f8.tar.xz nixlib-73265c19c73311a600894a0d482b2a3da9a323f8.tar.zst nixlib-73265c19c73311a600894a0d482b2a3da9a323f8.zip |
Merge pull request #61369 from rvolosatovs/fix/kitty
Fix Kitty wrapper on MacOS
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/kitty/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 3edb48cc489b..be70efba5ad7 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -2,7 +2,7 @@ harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, - which, dbus, + which, dbus, fetchpatch, Cocoa, CoreGraphics, Foundation, @@ -67,6 +67,17 @@ buildPythonApplication rec { libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so"; }) ] ++ stdenv.lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "macos-symlink-1"; + url = https://github.com/kovidgoyal/kitty/commit/bdeec612667f6976109247fe1750b10dda9c24c0.patch; + sha256 = "1d18x260w059qag80kgb2cgi2h4rricvqhwpbrw79s8yxzs7jhxk"; + }) + (fetchpatch { + # fixup of previous patch + name = "macos-symlink-2"; + url = https://github.com/kovidgoyal/kitty/commit/af2c9a49b1ad31e94242295d88598591623fbf11.patch; + sha256 = "0k3dmgbvmh66j8k3h8dw6la6ma6f20fng6jjypy982kxvracsnl5"; + }) ./macos-10.11.patch ./no-lto.patch ./no-werror.patch @@ -84,7 +95,7 @@ buildPythonApplication rec { mkdir -p $out ${if stdenv.isDarwin then '' mkdir "$out/bin" - ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty" + ln -s ../Applications/kitty.app/Contents/MacOS/kitty-deref-symlink "$out/bin/kitty" mkdir "$out/Applications" cp -r kitty.app "$out/Applications/kitty.app" '' else '' |