diff --git a/pkgs/applications/version-management/gitqlient/default.nix b/pkgs/by-name/gi/gitqlient/package.nix
similarity index 65%
rename from pkgs/applications/version-management/gitqlient/default.nix
rename to pkgs/by-name/gi/gitqlient/package.nix
index f396dfeed177..2dd1b4973ad3 100644
--- a/pkgs/applications/version-management/gitqlient/default.nix
+++ b/pkgs/by-name/gi/gitqlient/package.nix
@@ -1,30 +1,30 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
-  qmake,
-  qtwebengine,
+  libsForQt5,
   gitUpdater,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gitqlient";
   version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "francescmm";
     repo = "gitqlient";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-gfWky5KTSj+5FC++QIVTJbrDOYi/dirTzs6LvTnO74A=";
   };
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtwebengine
+    libsForQt5.qtwebengine
   ];
 
   qmakeFlags = [
@@ -35,12 +35,12 @@ mkDerivation rec {
     rev-prefix = "v";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/francescmm/GitQlient";
     description = "Multi-platform Git client written with Qt";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo ];
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ romildo ];
     mainProgram = "gitqlient";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9917b580922..03fb17ebc456 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3067,8 +3067,6 @@ with pkgs;
 
   gitlab-workhorse = callPackage ../by-name/gi/gitlab/gitlab-workhorse { };
 
-  gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { };
-
   glogg = libsForQt5.callPackage ../tools/text/glogg { };
 
   gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect {