diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
index ff8b9f6eef8e..51449ea3289a 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
@@ -8,9 +8,8 @@
   python3Packages,
   runCommand,
   scdoc,
-  withManPage ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform),
-  withShellCompletion ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform),
   withNgSuffix ? true,
+  withShellFiles ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform),
 }:
 let
   executable = if withNgSuffix then "nixos-rebuild-ng" else "nixos-rebuild";
@@ -29,16 +28,11 @@ python3Packages.buildPythonApplication rec {
     tabulate
   ];
 
-  nativeBuildInputs =
-    lib.optionals (withManPage || withShellCompletion) [
-      installShellFiles
-    ]
-    ++ lib.optionals withManPage [
-      scdoc
-    ]
-    ++ lib.optionals withShellCompletion [
-      python3Packages.shtab
-    ];
+  nativeBuildInputs = lib.optionals withShellFiles [
+    installShellFiles
+    python3Packages.shtab
+    scdoc
+  ];
 
   propagatedBuildInputs = [
     # Make sure that we use the Nix package we depend on, not something
@@ -55,21 +49,18 @@ python3Packages.buildPythonApplication rec {
   postPatch = ''
     substituteInPlace nixos_rebuild/__init__.py \
       --subst-var-by executable ${executable}
+    substituteInPlace pyproject.toml \
+      --subst-var-by executable ${executable}
   '';
 
-  postInstall =
-    lib.optionalString withManPage ''
-      scdoc < ${./nixos-rebuild.8.scd} > ${executable}.8
-      installManPage ${executable}.8
-    ''
-    + lib.optionalString withShellCompletion ''
-      installShellCompletion --cmd ${executable} \
-        --bash <(shtab --shell bash nixos_rebuild.get_main_parser) \
-        --zsh <(shtab --shell zsh nixos_rebuild.get_main_parser)
-    ''
-    + lib.optionalString withNgSuffix ''
-      mv $out/bin/nixos-rebuild $out/bin/${executable}
-    '';
+  postInstall = lib.optionalString withShellFiles ''
+    scdoc < ${./nixos-rebuild.8.scd} > ${executable}.8
+    installManPage ${executable}.8
+
+    installShellCompletion --cmd ${executable} \
+      --bash <(shtab --shell bash nixos_rebuild.get_main_parser) \
+      --zsh <(shtab --shell zsh nixos_rebuild.get_main_parser)
+  '';
 
   nativeCheckInputs = with python3Packages; [
     pytestCheckHook
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml b/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml
index d773e8888923..e640188d363a 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml
@@ -7,7 +7,7 @@ name = "nixos-rebuild-ng"
 version = "0.0.0"
 
 [project.scripts]
-nixos-rebuild = "nixos_rebuild:main"
+@executable@ = "nixos_rebuild:main"
 
 [tool.setuptools.package-data]
 nixos_rebuild = ["*.template.nix"]