From c6c1a1c3188fa049776aadbc9d647af679689fa3 Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Mon, 28 Jul 2025 12:45:41 +0800
Subject: [PATCH] fclones-gui: move to by-name

---
 .../fc/fclones-gui/package.nix}                 | 17 ++++++++---------
 pkgs/top-level/all-packages.nix                 |  2 --
 2 files changed, 8 insertions(+), 11 deletions(-)
 rename pkgs/{tools/misc/fclones/gui.nix => by-name/fc/fclones-gui/package.nix} (74%)

diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/by-name/fc/fclones-gui/package.nix
similarity index 74%
rename from pkgs/tools/misc/fclones/gui.nix
rename to pkgs/by-name/fc/fclones-gui/package.nix
index 05eef704d9c4..76d49f821a73 100644
--- a/pkgs/tools/misc/fclones/gui.nix
+++ b/pkgs/by-name/fc/fclones-gui/package.nix
@@ -9,14 +9,14 @@
   libadwaita,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fclones-gui";
   version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "pkolaczk";
     repo = "fclones-gui";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ad7wyoCjSQ8i6c+4IorImqAY2Q6pwBtI2JkkbkGa46U=";
   };
 
@@ -35,18 +35,17 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = ''
     substituteInPlace snap/gui/fclones-gui.desktop \
-      --replace 'Icon=''${SNAP}/meta/gui/fclones-gui.png' Icon=fclones-gui
-
+      --replace-fail "Icon=''${SNAP}/meta/gui/fclones-gui.png" "Icon=fclones-gui"
     install -Dm444 snap/gui/fclones-gui.desktop -t $out/share/applications
     install -Dm444 snap/gui/fclones-gui.png -t $out/share/pixmaps
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Interactive duplicate file remover";
     mainProgram = "fclones-gui";
     homepage = "https://github.com/pkolaczk/fclones-gui";
-    changelog = "https://github.com/pkolaczk/fclones-gui/releases/tag/${src.rev}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    changelog = "https://github.com/pkolaczk/fclones-gui/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = builtins.attrValues { inherit (lib.maintainers) figsoda; };
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8aac496ba84..433cec74cca3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12181,8 +12181,6 @@ with pkgs;
 
   fclones = callPackage ../tools/misc/fclones { };
 
-  fclones-gui = callPackage ../tools/misc/fclones/gui.nix { };
-
   feh = callPackage ../applications/graphics/feh {
     imlib2 = imlib2Full;
   };