diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/by-name/gp/gpg-tui/package.nix
similarity index 82%
rename from pkgs/tools/security/gpg-tui/default.nix
rename to pkgs/by-name/gp/gpg-tui/package.nix
index 0d974a230347..e9873c763f32 100644
--- a/pkgs/tools/security/gpg-tui/default.nix
+++ b/pkgs/by-name/gp/gpg-tui/package.nix
@@ -8,20 +8,20 @@
   pkg-config,
   python3,
   libiconv,
-  libresolv,
+  darwin,
   x11Support ? true,
   libxcb,
   libxkbcommon,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gpg-tui";
   version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "gpg-tui";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-qGm0eHpVFGn8tNdEnmQ4oIfjCxyixMFYdxih7pHvGH0=";
   };
 
@@ -44,13 +44,13 @@ rustPlatform.buildRustPackage rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
-    libresolv
+    darwin.libresolv
   ];
 
   meta = {
     description = "Terminal user interface for GnuPG";
     homepage = "https://github.com/orhun/gpg-tui";
-    changelog = "https://github.com/orhun/gpg-tui/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/orhun/gpg-tui/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       dotlambda
@@ -58,4 +58,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "gpg-tui";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63734f9d9c27..e851a2f94bea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1788,10 +1788,6 @@ with pkgs;
 
   ghidra-bin = callPackage ../tools/security/ghidra { };
 
-  gpg-tui = callPackage ../tools/security/gpg-tui {
-    inherit (darwin) libresolv;
-  };
-
   hocr-tools = with python3Packages; toPythonApplication hocr-tools;
 
   hopper = qt5.callPackage ../development/tools/analysis/hopper { };