From a552f494b9da0111983de9aa2185678e2bf223b3 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 9 Jun 2026 09:14:22 -0500
Subject: [PATCH] fcitx5-lua: switch to finalAttrs, hardcode pname, move lua5_3
 out of top-level

Assisted-by: Cursor Composer 2.5

fcitx5-lua: migrate to by-name

Assisted-by: Cursor Composer 2.5
---
 .../fc/fcitx5-lua/package.nix}                  | 17 ++++++++++++-----
 pkgs/top-level/all-packages.nix                 |  2 --
 2 files changed, 12 insertions(+), 7 deletions(-)
 rename pkgs/{tools/inputmethods/fcitx5/fcitx5-lua.nix => by-name/fc/fcitx5-lua/package.nix} (81%)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/by-name/fc/fcitx5-lua/package.nix
similarity index 81%
rename from pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
rename to pkgs/by-name/fc/fcitx5-lua/package.nix
index 884d77a7005d..9b3ffe06eff8 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
+++ b/pkgs/by-name/fc/fcitx5-lua/package.nix
@@ -6,17 +6,24 @@
   pkg-config,
   kdePackages,
   fcitx5,
-  lua,
+  lua5_3,
   gettext,
 }:
-stdenv.mkDerivation rec {
+
+let
+  lua = lua5_3;
+in
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "fcitx5-lua";
   version = "5.0.16";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "fcitx";
-    repo = pname;
-    rev = version;
+    repo = "fcitx5-lua";
+    tag = finalAttrs.version;
     hash = "sha256-df0BjORGT+zx/8kg/nGPDa9MBAXpPtdfx8S5O+E31wE=";
   };
 
@@ -43,4 +50,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ poscat ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30674f248999..de79450156a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2159,8 +2159,6 @@ with pkgs;
 
   Fabric = with python3Packages; toPythonApplication fabric;
 
-  fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { lua = lua5_3; };
-
   flatpak-builder = callPackage ../development/tools/flatpak-builder {
     binutils = binutils-unwrapped;
   };