From c66530e117e612de9b882f93f7f34fb0a85cc50d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 16:51:02 +0200
Subject: [PATCH] espanso: use finalAttrs

Avoids requiring to pass the new `espanso` itself when overriding.
---
 pkgs/by-name/es/espanso/package.nix | 7 +++----
 pkgs/top-level/all-packages.nix     | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix
index 4f1ee62bf05b..e9217bbf40a0 100644
--- a/pkgs/by-name/es/espanso/package.nix
+++ b/pkgs/by-name/es/espanso/package.nix
@@ -23,13 +23,12 @@
   waylandSupport ? false,
   x11Support ? stdenv.hostPlatform.isLinux,
   testers,
-  espanso,
 }:
 # espanso does not support building with both X11 and Wayland support at the same time
 assert stdenv.hostPlatform.isLinux -> x11Support != waylandSupport;
 assert stdenv.hostPlatform.isDarwin -> !x11Support;
 assert stdenv.hostPlatform.isDarwin -> !waylandSupport;
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "espanso";
   version = "2.2-unstable-2024-05-14";
 
@@ -130,7 +129,7 @@ rustPlatform.buildRustPackage {
       '';
 
   passthru.tests.version = testers.testVersion {
-    package = espanso;
+    package = finalAttrs.finalPackage;
     # remove when updating to a release version
     version = "2.2.1";
   };
@@ -151,4 +150,4 @@ rustPlatform.buildRustPackage {
       Espanso detects when you type a keyword and replaces it while you're typing.
     '';
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbac4f528229..4de8052eb06f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2129,7 +2129,6 @@ with pkgs;
   espanso-wayland = espanso.override {
     x11Support = false;
     waylandSupport = true;
-    espanso = espanso-wayland;
   };
 
   f3d_egl = f3d.override { vtk_9 = vtk_9_egl; };