From dc5ea0908da8359383c96bfa5f8c23fd5b8308d1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 13 Sep 2021 22:31:04 +0800 Subject: [PATCH] pantheon.touchegg: init --- pkgs/desktops/pantheon/default.nix | 2 ++ pkgs/tools/inputmethods/touchegg/default.nix | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index fb3af6506410..8da339844899 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -35,6 +35,8 @@ lib.makeScope pkgs.newScope (self: with self; { notes-up = pkgs.notes-up.override { withPantheon = true; }; + touchegg = pkgs.touchegg.override { withPantheon = true; }; + #### APPS appcenter = callPackage ./apps/appcenter { }; diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 007c5231109b..d1df32199545 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -11,6 +11,7 @@ , pkg-config , cmake , pantheon +, withPantheon ? false }: stdenv.mkDerivation rec { @@ -47,6 +48,15 @@ stdenv.mkDerivation rec { cmake ]; + patches = lib.optionals withPantheon [ + # Disable per-application gesture by default to make sure the default + # config does not conflict with Pantheon switchboard settings. + (fetchpatch { + url = "https://github.com/elementary/os-patches/commit/ada4e726540a2bb57b606c98e2531cfaaea57211.patch"; + sha256 = "0is9acwvgiqdhbiw11i3nq0rp0zldcza779fbj8k78cp329rbqb4"; + }) + ]; + meta = with lib; { homepage = "https://github.com/JoseExposito/touchegg"; description = "Linux multi-touch gesture recognizer";