diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-04-02 16:45:48 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-04-02 16:45:48 +0000 |
commit | 8ba23e138d9714bf309facf0003d69b1f8b86265 (patch) | |
tree | 9412925f611693a9a3ff880c10392b3763eafecb /pkgs/applications/terminal-emulators | |
parent | 040d8929bd4548fd0e2969476eb227f920ae06b8 (diff) | |
parent | 66754ae952bb2ffd16e793f4be00ffecb9253e28 (diff) |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts: pkgs/development/libraries/zlib/default.nix pkgs/development/lua-modules/overrides.nix
Diffstat (limited to 'pkgs/applications/terminal-emulators')
-rw-r--r-- | pkgs/applications/terminal-emulators/kitty/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index d06c6d937c11b..52e691f985045 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -90,6 +90,11 @@ buildPythonApplication rec { url = "https://github.com/kovidgoyal/kitty/commit/d8ed42ae8e014d9abf9550a65ae203468f8bfa43.patch"; sha256 = "sha256-Azgzqf5atW999FVn9rSGKMyZLsI692dYXhJPx07GBO0="; }) + (fetchpatch { + name = "fix-build-with-non-framework-python-on-darwin.patch"; + url = "https://github.com/kovidgoyal/kitty/commit/57cffc71b78244e6a9d49f4c9af24d1a88dbf537.patch"; + sha256 = "sha256-1IGONSVCVo5SmLKw90eqxaI5Mwc764O1ur+aMsc7h94="; + }) ]; # Causes build failure due to warning |