diff --git a/pkgs/tools/misc/nvfancontrol/default.nix b/pkgs/by-name/nv/nvfancontrol/package.nix
similarity index 91%
rename from pkgs/tools/misc/nvfancontrol/default.nix
rename to pkgs/by-name/nv/nvfancontrol/package.nix
index 48b7872c9c84..7fa9d965320d 100644
--- a/pkgs/tools/misc/nvfancontrol/default.nix
+++ b/pkgs/by-name/nv/nvfancontrol/package.nix
@@ -2,11 +2,13 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  libXNVCtrl,
+  linuxPackages,
   libx11,
   libxext,
 }:
-
+let
+  libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
+in
 rustPlatform.buildRustPackage rec {
   pname = "nvfancontrol";
   version = "0.5.1";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec7d645fdbdc..57b7e6644f80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3077,10 +3077,6 @@ with pkgs;
   # ntfsprogs are merged into ntfs-3g
   ntfsprogs = pkgs.ntfs3g;
 
-  nvfancontrol = callPackage ../tools/misc/nvfancontrol {
-    libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
-  };
-
   nwdiag = with python3Packages; toPythonApplication nwdiag;
 
   ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { };