Merge master into staging-next

2021-01-26 18:27:09 +00:00
parent 69fca326f8 fbaf922705
commit c994c9d31e
22 changed files with 62 additions and 71 deletions
@@ -12,7 +12,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename> sub
 <screen>
 <prompt>$ </prompt>cd /path/to/nixpkgs/doc
 <prompt>$ </prompt>nix-shell
-<prompt>[nix-shell]$ </prompt>make
+<prompt>[nix-shell]$ </prompt>make $makeFlags
 </screen>
 <para>
  If you experience problems, run <command>make debug</command> to help understand the docbook errors.