summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2022-02-14 19:36:49 +0300
committerNikolay Amiantov <ab@fmap.me>2022-02-16 22:22:32 +0300
commit29fd78747ae72b28d06bf19df2b8faf2a1d9a7eb (patch)
tree949c363a864538f8c218d68ef67215bf4ab05b37
parent7852ea15964f685bd73eaa7e11279668ec5c0d40 (diff)
downloadnixpkgs-29fd78747ae72b28d06bf19df2b8faf2a1d9a7eb.tar
nixpkgs-29fd78747ae72b28d06bf19df2b8faf2a1d9a7eb.tar.gz
nixpkgs-29fd78747ae72b28d06bf19df2b8faf2a1d9a7eb.tar.bz2
nixpkgs-29fd78747ae72b28d06bf19df2b8faf2a1d9a7eb.tar.lz
nixpkgs-29fd78747ae72b28d06bf19df2b8faf2a1d9a7eb.tar.xz
nixpkgs-29fd78747ae72b28d06bf19df2b8faf2a1d9a7eb.tar.zst
nixpkgs-29fd78747ae72b28d06bf19df2b8faf2a1d9a7eb.zip
nixos/manual: use system nixpkgs to build pxe image
The command in example is expected to be run from nixpkgs checkout, but
there's no explanation of this. Let's just use system nixpkgs: most
users will have it just working and those who use git checkouts will
figure it out.
-rw-r--r--nixos/doc/manual/from_md/installation/installing-pxe.section.xml4
-rw-r--r--nixos/doc/manual/installation/installing-pxe.section.md4
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml b/nixos/doc/manual/from_md/installation/installing-pxe.section.xml
index 1dd15ddacba..94172de65ea 100644
--- a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml
+++ b/nixos/doc/manual/from_md/installation/installing-pxe.section.xml
@@ -7,11 +7,11 @@
   <para>
     These instructions assume that you have an existing PXE or iPXE
     infrastructure and simply want to add the NixOS installer as another
-    option. To build the necessary files from a recent version of
+    option. To build the necessary files from your current version of
     nixpkgs, you can run:
   </para>
   <programlisting>
-nix-build -A netboot.x86_64-linux nixos/release.nix
+nix-build -A netboot.x86_64-linux '&lt;nixpkgs/nixos/release.nix&gt;'
 </programlisting>
   <para>
     This will create a <literal>result</literal> directory containing: *
diff --git a/nixos/doc/manual/installation/installing-pxe.section.md b/nixos/doc/manual/installation/installing-pxe.section.md
index 2016a258251..4fbd6525f8c 100644
--- a/nixos/doc/manual/installation/installing-pxe.section.md
+++ b/nixos/doc/manual/installation/installing-pxe.section.md
@@ -5,11 +5,11 @@ setup.
 
 These instructions assume that you have an existing PXE or iPXE
 infrastructure and simply want to add the NixOS installer as another
-option. To build the necessary files from a recent version of nixpkgs,
+option. To build the necessary files from your current version of nixpkgs,
 you can run:
 
 ```ShellSession
-nix-build -A netboot.x86_64-linux nixos/release.nix
+nix-build -A netboot.x86_64-linux '<nixpkgs/nixos/release.nix>'
 ```
 
 This will create a `result` directory containing: \* `bzImage` -- the