From 5ced0ad3b2cc1440f5c70f1bad235d1494c3657e Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Thu, 20 Jun 2024 20:28:10 +0200
Subject: [PATCH 1/3] outputs: add by-name overlay when building nixos
 configuration

---
 outputs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/outputs.nix b/outputs.nix
index 2a56c20..b151505 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -38,6 +38,7 @@ self = {
           {
             config.nixpkgs.overlays = [
               ( import ./pkgs/overlays/selfExpr.nix { nixpkgsPath = "${builtins.toString ./.}/pkgs/top-level/impure.nix"; } )
+              ( import "${inputs.nixpkgs}/pkgs/top-level/by-name-overlay.nix" "${builtins.toString ./.}/pkgs/by-name" )
               self.overlays.versionInfoFixup
             ];
           }

From ecfe787bcaed02cddfe2c620cbaf0790643a426f Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Thu, 20 Jun 2024 20:38:37 +0200
Subject: [PATCH 2/3] pkgs/nixos-rebuild: patch in fallback to nixpkgs input

---
 pkgs/by-name/ni/nixos-rebuild/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild/package.nix b/pkgs/by-name/ni/nixos-rebuild/package.nix
index 63f8c92..e9eb945 100644
--- a/pkgs/by-name/ni/nixos-rebuild/package.nix
+++ b/pkgs/by-name/ni/nixos-rebuild/package.nix
@@ -12,7 +12,7 @@
 , installShellFiles
 }:
 let
-  fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix;
+  fallback = import "${(import ../../../../inputs.nix {}).nixpkgs}/nixos/modules/installer/tools/nix-fallback-paths.nix";
 in
 substitute {
   name = "nixos-rebuild";

From c62e6901a9e8b65b995b74eb970bc8340debfb0a Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Thu, 20 Jun 2024 21:11:24 +0200
Subject: [PATCH 3/3] pkgs/nixos-rebuild: fix typo

---
 pkgs/by-name/ni/nixos-rebuild/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild/nixos-rebuild.sh b/pkgs/by-name/ni/nixos-rebuild/nixos-rebuild.sh
index ac00f3d..5cfff7a 100755
--- a/pkgs/by-name/ni/nixos-rebuild/nixos-rebuild.sh
+++ b/pkgs/by-name/ni/nixos-rebuild/nixos-rebuild.sh
@@ -454,7 +454,7 @@ trap cleanup EXIT
 # Re-execute nixos-rebuild from the Nixpkgs tree.
 if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast ]]; then
     if [[ -z $buildingAttribute ]]; then
-        p=$(runCmd nix-build --no-out-link $buildFile -A "${$attr:+$attr.}config.system.build.nixos-rebuild" "${extraBuildFlags[@]}")
+        p=$(runCmd nix-build --no-out-link $buildFile -A "${attr:+$attr.}config.system.build.nixos-rebuild" "${extraBuildFlags[@]}")
         SHOULD_REEXEC=1
     elif [[ -z $flake ]]; then
         if p=$(runCmd nix-build --no-out-link --expr 'with import <nixpkgs/nixos> {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then