From f974f1168bdb70dd40646c04feaa24ce7b4aab8a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 31 Dec 2024 23:25:58 +0800 Subject: [PATCH] pantheon.elementary-terminal: Backport shortcut fixes This fixes unexpected behaviour with Ctrl+K / Ctrl+L. --- .../apps/elementary-terminal/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 62a0861432d7..ac0ad40d8455 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, nix-update-script, pkg-config, meson, @@ -30,6 +31,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-Pr2Jm37vuw1DOx63BXKT3oPK6C7i5v9ObYFNR6Hvhns="; }; + patches = [ + # Fix clear and reset actions when ongoing foreground process + # https://github.com/elementary/terminal/pull/823 + (fetchpatch { + url = "https://github.com/elementary/terminal/commit/3c84bcb98ecdadb4d5e0c7a8f52fb5238f5e92f0.patch"; + hash = "sha256-XViJR+vj+qy2A1nZa3Pdo8uY24tS4ZqZKjTAyPN9sPA="; + }) + # Only reset/clear screen when is pressed + # https://github.com/elementary/terminal/pull/827 + (fetchpatch { + url = "https://github.com/elementary/terminal/commit/91b93d883c2b8a8549d9743292d6a564e3b2d3cb.patch"; + hash = "sha256-3opiRhQLJCYFDwDjEbm0CZ9y8CF/6biU+cJk1Ideyks="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils meson