From 5dce1034d63feb8fbb63a7631805617af2346be1 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 29 May 2025 17:02:26 +0200
Subject: [PATCH 1/2] touchegg: remove unused pcre dependency

---
 pkgs/by-name/to/touchegg/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/to/touchegg/package.nix b/pkgs/by-name/to/touchegg/package.nix
index ceb7da0e9b52..60a777682b67 100644
--- a/pkgs/by-name/to/touchegg/package.nix
+++ b/pkgs/by-name/to/touchegg/package.nix
@@ -10,7 +10,6 @@
   cairo,
   xorg,
   gtk3-x11,
-  pcre,
   pkg-config,
   cmake,
   pantheon,
@@ -56,7 +55,6 @@ stdenv.mkDerivation rec {
       pugixml
       cairo
       gtk3-x11
-      pcre
     ]
     ++ (with xorg; [
       libX11

From baffb1d464021a9cebb08aefebb58e9625022beb Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 29 May 2025 17:07:15 +0200
Subject: [PATCH 2/2] touchegg: modernize

---
 pkgs/by-name/to/touchegg/package.nix | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/to/touchegg/package.nix b/pkgs/by-name/to/touchegg/package.nix
index 60a777682b67..5bc94928283b 100644
--- a/pkgs/by-name/to/touchegg/package.nix
+++ b/pkgs/by-name/to/touchegg/package.nix
@@ -12,19 +12,18 @@
   gtk3-x11,
   pkg-config,
   cmake,
-  pantheon,
   withPantheon ? false,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "touchegg";
   version = "2.0.18";
 
   src = fetchFromGitHub {
     owner = "JoseExposito";
     repo = "touchegg";
-    rev = version;
-    sha256 = "sha256-7LJ5gD2e6e4edKDabqmsiXTdNKJ39557Q4sEGWF8H1U=";
+    tag = finalAttrs.version;
+    hash = "sha256-7LJ5gD2e6e4edKDabqmsiXTdNKJ39557Q4sEGWF8H1U=";
   };
 
   patches = lib.optionals withPantheon [
@@ -32,14 +31,14 @@ stdenv.mkDerivation rec {
     # Reverts https://github.com/JoseExposito/touchegg/pull/603
     (fetchpatch {
       url = "https://github.com/JoseExposito/touchegg/commit/34e947181d84620021601e7f28deb1983a154da8.patch";
-      sha256 = "sha256-qbWwmEzVXvDAhhrGvMkKN4YNtnFfRW+Yra+i6VEQX4g=";
+      hash = "sha256-qbWwmEzVXvDAhhrGvMkKN4YNtnFfRW+Yra+i6VEQX4g=";
       revert = true;
     })
     # 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/7d9b133e02132d7f13cf2fe850b2fe4c015c3c5e.patch";
-      sha256 = "sha256-ZOGVkxiXoTORXC6doz5r9IObAbYjhsDjgg3HtzlTSUc=";
+      hash = "sha256-ZOGVkxiXoTORXC6doz5r9IObAbYjhsDjgg3HtzlTSUc=";
     })
   ];
 
@@ -72,12 +71,12 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/JoseExposito/touchegg";
     description = "Linux multi-touch gesture recognizer";
     mainProgram = "touchegg";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    teams = [ teams.pantheon ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.pantheon ];
   };
-}
+})