diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 1dc0578daca6..f79ed3493dfb 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -42,7 +42,7 @@ let
   nixos-option =
     if lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre"
     then null
-    else pkgs.callPackage ./nixos-option { };
+    else pkgs.nixos-option;
 
   nixos-version = makeProg {
     name = "nixos-version";
diff --git a/nixos/modules/installer/tools/nixos-option/CMakeLists.txt b/pkgs/tools/nix/nixos-option/CMakeLists.txt
similarity index 100%
rename from nixos/modules/installer/tools/nixos-option/CMakeLists.txt
rename to pkgs/tools/nix/nixos-option/CMakeLists.txt
diff --git a/nixos/modules/installer/tools/nixos-option/default.nix b/pkgs/tools/nix/nixos-option/default.nix
similarity index 99%
rename from nixos/modules/installer/tools/nixos-option/default.nix
rename to pkgs/tools/nix/nixos-option/default.nix
index 72eec3a38363..216e2678e2e2 100644
--- a/nixos/modules/installer/tools/nixos-option/default.nix
+++ b/pkgs/tools/nix/nixos-option/default.nix
@@ -1,4 +1,5 @@
 {lib, stdenv, boost, cmake, pkg-config, nix, ... }:
+
 stdenv.mkDerivation rec {
   name = "nixos-option";
   src = ./.;
diff --git a/nixos/modules/installer/tools/nixos-option/libnix-copy-paste.cc b/pkgs/tools/nix/nixos-option/libnix-copy-paste.cc
similarity index 100%
rename from nixos/modules/installer/tools/nixos-option/libnix-copy-paste.cc
rename to pkgs/tools/nix/nixos-option/libnix-copy-paste.cc
diff --git a/nixos/modules/installer/tools/nixos-option/libnix-copy-paste.hh b/pkgs/tools/nix/nixos-option/libnix-copy-paste.hh
similarity index 100%
rename from nixos/modules/installer/tools/nixos-option/libnix-copy-paste.hh
rename to pkgs/tools/nix/nixos-option/libnix-copy-paste.hh
diff --git a/nixos/modules/installer/tools/nixos-option/nixos-option.cc b/pkgs/tools/nix/nixos-option/nixos-option.cc
similarity index 100%
rename from nixos/modules/installer/tools/nixos-option/nixos-option.cc
rename to pkgs/tools/nix/nixos-option/nixos-option.cc
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 786dd4e0dc21..909bdaa1638d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31185,6 +31185,8 @@ in
 
   nix-linter = haskell.lib.justStaticExecutables (haskellPackages.nix-linter);
 
+  nixos-option = callPackage ../tools/nix/nixos-option { };
+
   nix-pin = callPackage ../tools/package-management/nix-pin { };
 
   nix-prefetch = callPackage ../tools/package-management/nix-prefetch { };