ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9607 from nckx/update-doc

Browse Source 
doc: specify that *Flags are string lists
This commit is contained in:
Domen Kožar 2016-08-31 10:02:16 +02:00 committed by GitHub
commit 7b3a36132a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/stdenv.xml
View File

@ -557,8 +557,8 @@ script) if it exists.</para>
<varlistentry> <varlistentry>
<term><varname>configureFlags</varname></term> <term><varname>configureFlags</varname></term>
<listitem><para>Additional arguments passed to the configure <listitem><para>A list of strings passed as additional arguments to the
script.</para></listitem> configure script.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -658,7 +658,7 @@ nothing.</para>
<varlistentry> <varlistentry>
<term><varname>makeFlags</varname></term> <term><varname>makeFlags</varname></term>
<listitem><para>Additional flags passed to <listitem><para>A list of strings passed as additional flags to
<command>make</command>. These flags are also used by the default <command>make</command>. These flags are also used by the default
install and check phase. For setting make flags specific to the install and check phase. For setting make flags specific to the
build phase, use <varname>buildFlags</varname> (see build phase, use <varname>buildFlags</varname> (see
@ -685,7 +685,7 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
<varlistentry> <varlistentry>
<term><varname>buildFlags</varname> / <varname>buildFlagsArray</varname></term> <term><varname>buildFlags</varname> / <varname>buildFlagsArray</varname></term>
<listitem><para>Additional flags passed to <listitem><para>A list of strings passed as additional flags to
<command>make</command>. Like <varname>makeFlags</varname> and <command>make</command>. Like <varname>makeFlags</varname> and
<varname>makeFlagsArray</varname>, but only used by the build <varname>makeFlagsArray</varname>, but only used by the build
phase.</para></listitem> phase.</para></listitem>
@ -753,7 +753,7 @@ doCheck = true;</programlisting>
<varlistentry> <varlistentry>
<term><varname>checkFlags</varname> / <varname>checkFlagsArray</varname></term> <term><varname>checkFlags</varname> / <varname>checkFlagsArray</varname></term>
<listitem><para>Additional flags passed to <listitem><para>A list of strings passed as additional flags to
<command>make</command>. Like <varname>makeFlags</varname> and <command>make</command>. Like <varname>makeFlags</varname> and
<varname>makeFlagsArray</varname>, but only used by the check <varname>makeFlagsArray</varname>, but only used by the check
phase.</para></listitem> phase.</para></listitem>
@ -808,7 +808,7 @@ installTargets = "install-bin install-doc";</programlisting>
<varlistentry> <varlistentry>
<term><varname>installFlags</varname> / <varname>installFlagsArray</varname></term> <term><varname>installFlags</varname> / <varname>installFlagsArray</varname></term>
<listitem><para>Additional flags passed to <listitem><para>A list of strings passed as additional flags to
<command>make</command>. Like <varname>makeFlags</varname> and <command>make</command>. Like <varname>makeFlags</varname> and
<varname>makeFlagsArray</varname>, but only used by the install <varname>makeFlagsArray</varname>, but only used by the install
phase.</para></listitem> phase.</para></listitem>