diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/by-name/ti/tikzit/package.nix
similarity index 90%
rename from pkgs/tools/typesetting/tikzit/default.nix
rename to pkgs/by-name/ti/tikzit/package.nix
index 481bc29d1d6f..4531d766617c 100644
--- a/pkgs/tools/typesetting/tikzit/default.nix
+++ b/pkgs/by-name/ti/tikzit/package.nix
@@ -2,13 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qttools,
-  qtbase,
-  poppler,
+  qt5,
   flex,
   bison,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -23,15 +20,15 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
+    qt5.qmake
+    qt5.qttools
     flex
     bison
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    poppler
+    qt5.qtbase
+    libsForQt5.poppler
   ];
 
   # src/data/tikzlexer.l:29:10: fatal error: tikzparser.parser.hpp: No such file or directory
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 744239ca6bb0..e5bcf8ee3b6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3583,8 +3583,6 @@ with pkgs;
 
   tinc = callPackage ../tools/networking/tinc { };
 
-  tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { };
-
   tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };
 
   tldr-hs = haskellPackages.tldr;