From 1f9fc918cedc855bd106696d9b2038a0dbdcf52c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 21 Sep 2024 12:44:04 +0300
Subject: [PATCH] treewide: use pkgs.nixos-enter instead of
 config.system.build.nixos-enter

---
 nixos/doc/manual/development/testing-installer.chapter.md | 4 ++--
 nixos/lib/make-disk-image.nix                             | 2 +-
 nixos/lib/make-multi-disk-zfs-image.nix                   | 2 +-
 nixos/lib/make-single-disk-zfs-image.nix                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/development/testing-installer.chapter.md b/nixos/doc/manual/development/testing-installer.chapter.md
index 2eaa01614920..92c759a8559a 100644
--- a/nixos/doc/manual/development/testing-installer.chapter.md
+++ b/nixos/doc/manual/development/testing-installer.chapter.md
@@ -6,13 +6,13 @@ tedious, so here is a quick way to see if the installer works properly:
 ```ShellSession
 # mount -t tmpfs none /mnt
 # nixos-generate-config --root /mnt
-$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install
+$ nix-build '<nixpkgs>' -A nixos-install
 # ./result/bin/nixos-install
 ```
 
 To start a login shell in the new NixOS installation in `/mnt`:
 
 ```ShellSession
-$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter
+$ nix-build '<nixpkgs>' -A nixos-enter
 # ./result/bin/nixos-enter
 ```
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 208eaf59dc5c..a943edb7b574 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -321,7 +321,7 @@ let format' = format; in let
       e2fsprogs
       lkl
       config.system.build.nixos-install
-      config.system.build.nixos-enter
+      nixos-enter
       nix
       systemdMinimal
     ]
diff --git a/nixos/lib/make-multi-disk-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix
index 077bb8f22707..1dac232e2b8c 100644
--- a/nixos/lib/make-multi-disk-zfs-image.nix
+++ b/nixos/lib/make-multi-disk-zfs-image.nix
@@ -124,7 +124,7 @@ let
 
   tools = lib.makeBinPath (
     with pkgs; [
-      config.system.build.nixos-enter
+      nixos-enter
       config.system.build.nixos-install
       dosfstools
       e2fsprogs
diff --git a/nixos/lib/make-single-disk-zfs-image.nix b/nixos/lib/make-single-disk-zfs-image.nix
index 585fa93b7fa0..e37b79797dca 100644
--- a/nixos/lib/make-single-disk-zfs-image.nix
+++ b/nixos/lib/make-single-disk-zfs-image.nix
@@ -112,7 +112,7 @@ let
 
   tools = lib.makeBinPath (
     with pkgs; [
-      config.system.build.nixos-enter
+      nixos-enter
       config.system.build.nixos-install
       dosfstools
       e2fsprogs