Merge pull request #109469 from domenkozar/pkgs.nixos-rebuild

move nixos-rebuild into pkgs

nixos/modules/installer/tools/tools.nix

@@ -28,17 +28,7 @@ let
     ];
   };
 
-  nixos-rebuild =
+  nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; };
-    let fallback = import ./nix-fallback-paths.nix; in
-    makeProg {
-      name = "nixos-rebuild";
-      src = ./nixos-rebuild.sh;
-      inherit (pkgs) runtimeShell;
-      nix = config.nix.package.out;
-      nix_x86_64_linux = fallback.x86_64-linux;
-      nix_i686_linux = fallback.i686-linux;
-      path = makeBinPath [ pkgs.jq ];
-    };
 
   nixos-generate-config = makeProg {
     name = "nixos-generate-config";

pkgs/os-specific/linux/nixos-rebuild/default.nix

@@ -0,0 +1,14 @@
+{ substituteAll, runtimeShell, jq, nix, lib }:
+
+let
+  fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix;
+in substituteAll {
+  name = "nixos-rebuild";
+  src = ./nixos-rebuild.sh;
+  dir = "bin";
+  isExecutable = true;
+  inherit runtimeShell nix;
+  nix_x86_64_linux = fallback.x86_64-linux;
+  nix_i686_linux = fallback.i686-linux;
+  path = lib.makeBinPath [ jq ];
+}

pkgs/top-level/all-packages.nix

@@ -28905,6 +28905,8 @@ in
 
   nixos-generators = callPackage ../tools/nix/nixos-generators { };
 
+  nixos-rebuild = callPackage ../os-specific/linux/nixos-rebuild { };
+
   norwester-font = callPackage ../data/fonts/norwester  {};
 
   nut = callPackage ../applications/misc/nut { };