diff --git a/pkgs/games/qtads/default.nix b/pkgs/by-name/qt/qtads/package.nix
similarity index 58%
rename from pkgs/games/qtads/default.nix
rename to pkgs/by-name/qt/qtads/package.nix
index 90f6652ac658..ae92c2f70003 100644
--- a/pkgs/games/qtads/default.nix
+++ b/pkgs/by-name/qt/qtads/package.nix
@@ -1,31 +1,31 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   pkg-config,
-  qmake,
   SDL2,
   fluidsynth,
   libsndfile,
   libvorbis,
   mpg123,
-  qtbase,
+  qt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qtads";
   version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "realnc";
     repo = "qtads";
-    rev = "v${version}";
-    sha256 = "sha256-KIqufpvl7zeUtDBXUOAZxBIbfv+s51DoSaZr3jol+bw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-KIqufpvl7zeUtDBXUOAZxBIbfv+s51DoSaZr3jol+bw=";
   };
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    qt5.qmake
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -34,15 +34,15 @@ mkDerivation rec {
     libsndfile
     libvorbis
     mpg123
-    qtbase
+    qt5.qtbase
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://realnc.github.io/qtads/";
     description = "Multimedia interpreter for TADS games";
     mainProgram = "qtads";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ orivej ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ orivej ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89d54e0b19b0..bb91e16c9856 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13191,8 +13191,6 @@ with pkgs;
 
   gscrabble = python3Packages.callPackage ../games/gscrabble { };
 
-  qtads = qt5.callPackage ../games/qtads { };
-
   ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };
 
   # used as base package for iortcw forks