diff --git a/pkgs/by-name/ap/apidog/package.nix b/pkgs/by-name/ap/apidog/package.nix
index 97d71f82f788..6a4fae65fab6 100644
--- a/pkgs/by-name/ap/apidog/package.nix
+++ b/pkgs/by-name/ap/apidog/package.nix
@@ -5,35 +5,15 @@
   makeDesktopItem,
 }:
 
-let
+appimageTools.wrapType2 (finalAttrs: {
   pname = "apidog";
   version = "2.8.52";
 
   src = fetchurl {
-    url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage";
+    url = "https://file-assets.apidog.com/download/${finalAttrs.version}/Apidog-${finalAttrs.version}.AppImage";
     hash = "sha256-xf+xMayNgJE6ms7/xvTAQj0jZlgPknHvGqNN5DQprsI=";
   };
 
-  appimageContents = appimageTools.extract {
-    inherit pname version src;
-  };
-
-  desktopItem = makeDesktopItem {
-    name = "apidog";
-    exec = "apidog %U";
-    icon = "apidog";
-    desktopName = "Apidog";
-    comment = "All-in-One API Platform: Design, Debug, Mock, Test, and Document.";
-    categories = [
-      "Development"
-      "Utility"
-    ];
-    mimeTypes = [ "x-scheme-handler/apidog" ];
-  };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
-
   extraPkgs = pkgs: [
     pkgs.nss
     pkgs.gtk3
@@ -50,11 +30,24 @@ appimageTools.wrapType2 {
   ];
 
   extraInstallCommands = ''
-    install -Dm444 ${appimageContents}/apidog.png \
+    install -Dm444 ${finalAttrs.contents}/apidog.png \
       $out/share/icons/hicolor/512x512/apps/apidog.png
   '';
 
-  desktopItems = [ desktopItem ];
+  desktopItems = [
+    (makeDesktopItem {
+      name = "apidog";
+      exec = "apidog %U";
+      icon = "apidog";
+      desktopName = "Apidog";
+      comment = "All-in-One API Platform: Design, Debug, Mock, Test, and Document.";
+      categories = [
+        "Development"
+        "Utility"
+      ];
+      mimeTypes = [ "x-scheme-handler/apidog" ];
+    })
+  ];
 
   meta = with lib; {
     description = "All-in-one API design, test, mock and documentation platform";
@@ -65,4 +58,4 @@ appimageTools.wrapType2 {
     mainProgram = "apidog";
     maintainers = with maintainers; [ DomagojAlaber ];
   };
-}
+})