about summary refs log tree commit diff
path: root/pkgs/applications/terminal-emulators
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-07-28 18:01:52 +0000
committerGitHub <noreply@github.com>2023-07-28 18:01:52 +0000
commit039200b6c4f97182b973c9b55cdded6df7c07661 (patch)
tree9cf279c8a76bf6524a3012a04114541870f164df /pkgs/applications/terminal-emulators
parent70b27286364d6f03f2e4bcb030e51e92676a9451 (diff)
parent3460ec6a31b730cd630335a683790c93095962f8 (diff)
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/terminal-emulators')
-rw-r--r--pkgs/applications/terminal-emulators/foot/default.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix
index ec2d0d9250dcb..5a50ba9448a65 100644
--- a/pkgs/applications/terminal-emulators/foot/default.nix
+++ b/pkgs/applications/terminal-emulators/foot/default.nix
@@ -2,6 +2,7 @@
 , lib
 , fetchFromGitea
 , fetchurl
+, fetchpatch
 , runCommand
 , fcft
 , freetype
@@ -101,6 +102,17 @@ stdenv.mkDerivation rec {
     hash = "sha256-YCwmPSn+XtF7HkMOFJft7j/2vr+8UE59yu/iGZ1dT8A=";
   };
 
+  patches = [
+    # Check viewporter protocol support before using it, fixes crash under Mir
+    # Remove when https://codeberg.org/dnkl/foot/pulls/1445 in version > 1.15.1
+    (fetchpatch {
+      name = "0001-foot-dont-try-to-use-a-non-existing-viewporter-interface.patch";
+      url = "https://codeberg.org/dnkl/foot/commit/9d75c551465fa3dbb3cd20ae87d6de294fcebce1.patch";
+      excludes = [ "CHANGELOG.md" ];
+      hash = "sha256-sVfGbudsmwh7phbbobBgSXoGe1lKJ8s1UdyBnVLmLYQ=";
+    })
+  ];
+
   depsBuildBuild = [
     pkg-config
   ];