diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/by-name/fc/fclones-gui/package.nix similarity index 62% rename from pkgs/tools/misc/fclones/gui.nix rename to pkgs/by-name/fc/fclones-gui/package.nix index 05eef704d9c4..999eb2bcf2ca 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 - - install -Dm444 snap/gui/fclones-gui.desktop -t $out/share/applications - install -Dm444 snap/gui/fclones-gui.png -t $out/share/pixmaps + --replace-fail 'Icon=''${SNAP}/meta/gui/fclones-gui.png' "Icon=fclones-gui" + install -Dm 0644 snap/gui/fclones-gui.desktop -t $out/share/applications + install -Dm 0644 snap/gui/fclones-gui.png -t $out/share/icons/hicolor/256x256/apps ''; - 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 e72f5c3ff775..73d741c8628e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12172,8 +12172,6 @@ with pkgs; fclones = callPackage ../tools/misc/fclones { }; - fclones-gui = callPackage ../tools/misc/fclones/gui.nix { }; - feh = callPackage ../applications/graphics/feh { imlib2 = imlib2Full; };