From 17fe487f5a916cfce4bc9ce3755521374d7933e0 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 04:29:29 +0200
Subject: [PATCH] input-leap: move to by-name

---
 .../in}/input-leap/macos-no-dmg.patch         |  0
 .../in/input-leap/package.nix}                | 28 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  4 ---
 3 files changed, 12 insertions(+), 20 deletions(-)
 rename pkgs/{applications/misc => by-name/in}/input-leap/macos-no-dmg.patch (100%)
 rename pkgs/{applications/misc/input-leap/default.nix => by-name/in/input-leap/package.nix} (87%)

diff --git a/pkgs/applications/misc/input-leap/macos-no-dmg.patch b/pkgs/by-name/in/input-leap/macos-no-dmg.patch
similarity index 100%
rename from pkgs/applications/misc/input-leap/macos-no-dmg.patch
rename to pkgs/by-name/in/input-leap/macos-no-dmg.patch
diff --git a/pkgs/applications/misc/input-leap/default.nix b/pkgs/by-name/in/input-leap/package.nix
similarity index 87%
rename from pkgs/applications/misc/input-leap/default.nix
rename to pkgs/by-name/in/input-leap/package.nix
index 5fdc6ecadcec..329d388aec42 100644
--- a/pkgs/applications/misc/input-leap/default.nix
+++ b/pkgs/by-name/in/input-leap/package.nix
@@ -3,10 +3,6 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-
-  withLibei ? !stdenv.hostPlatform.isDarwin,
-
-  avahi,
   curl,
   libICE,
   libSM,
@@ -21,20 +17,20 @@
   openssl,
   pkgsStatic,
   pkg-config,
-  qtbase,
-  qttools,
+  qt6,
   wrapGAppsHook3,
-  wrapQtAppsHook,
+  avahi,
+  avahi' ? avahi.override { withLibdnssdCompat = true; },
+  withLibei ? !stdenv.hostPlatform.isDarwin,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "input-leap";
   version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "input-leap";
     repo = "input-leap";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-zSaeeMlhpWIX3y4OmZ7eHXCu1HPP7NU5HFkME/JZjuQ=";
     fetchSubmodules = true;
   };
@@ -45,14 +41,14 @@ stdenv.mkDerivation rec {
     pkg-config
     cmake
     wrapGAppsHook3
-    wrapQtAppsHook
-    qttools
+    qt6.wrapQtAppsHook
+    qt6.qttools
   ];
 
   buildInputs = [
     curl
-    qtbase
-    avahi
+    qt6.qtbase
+    avahi'
     libX11
     libXext
     libXtst
@@ -71,7 +67,7 @@ stdenv.mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DINPUTLEAP_REVISION=${builtins.substring 0 8 src.rev}"
+    "-DINPUTLEAP_REVISION=${builtins.substring 0 8 finalAttrs.src.rev}"
   ]
   ++ lib.optional withLibei "-DINPUTLEAP_BUILD_LIBEI=ON";
 
@@ -102,4 +98,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe4c18c89433..26669ffe930c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10059,10 +10059,6 @@ with pkgs;
 
   espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
 
-  input-leap = qt6Packages.callPackage ../applications/misc/input-leap {
-    avahi = avahi.override { withLibdnssdCompat = true; };
-  };
-
   evolution-data-server-gtk4 = evolution-data-server.override {
     withGtk3 = false;
     withGtk4 = true;