diff --git a/pkgs/applications/networking/remote/x2gokdriveclient/default.nix b/pkgs/by-name/x2/x2gokdriveclient/package.nix
similarity index 92%
rename from pkgs/applications/networking/remote/x2gokdriveclient/default.nix
rename to pkgs/by-name/x2/x2gokdriveclient/package.nix
index 162f0fe8c8b7..e339c39a3a21 100644
--- a/pkgs/applications/networking/remote/x2gokdriveclient/default.nix
+++ b/pkgs/by-name/x2/x2gokdriveclient/package.nix
@@ -3,11 +3,7 @@
   lib,
   fetchgit,
   qt5,
-  qtbase,
-  qtx11extras,
-  qttools,
   zlib,
-  gnumake,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,9 +23,9 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    qtbase
-    qtx11extras
-    qttools
+    qt5.qtbase
+    qt5.qtx11extras
+    qt5.qttools
     zlib
   ];
 
@@ -42,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "SHELL=/bin/bash" "SHELL=$SHELL" \
       --replace-fail "MAKEOVERRIDES" "NOMAKEOVERRIDES " \
       --replace-fail ".MAKEFLAGS" ".NOFLAGS " \
-      --replace-fail "qmake" "${qtbase.dev}/bin/qmake" \
+      --replace-fail "qmake" "${qt5.qtbase.dev}/bin/qmake" \
       --replace-fail "-o root -g root" ""
     substituteInPlace \
       VERSION.x2gokdriveclient \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d0e11e21108..89e71edf7bca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10340,8 +10340,6 @@ with pkgs;
 
   wrapThunderbird = callPackage ../applications/networking/mailreaders/thunderbird/wrapper.nix { };
 
-  x2gokdriveclient = libsForQt5.callPackage ../applications/networking/remote/x2gokdriveclient { };
-
   x32edit = callPackage ../applications/audio/midas/x32edit.nix { };
 
   kodiPackages = recurseIntoAttrs (kodi.packages);