nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

s/powerpc-darwin/x86_64-darwin/

Browse source 
Let's step in line with time and document more realistic values.
This commit is contained in:
Domen Kožar 2016-08-10 18:41:51 +02:00
parent 66adbdfd97
commit 9a1320af29
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/manual/advanced-topics/distributed-builds.xml
View file

@ -11,9 +11,9 @@ forward Nix builds to other machines over the network. This allows
multiple builds to be performed in parallel (thus improving multiple builds to be performed in parallel (thus improving
performance) and allows Nix to perform multi-platform builds in a performance) and allows Nix to perform multi-platform builds in a
semi-transparent way. For instance, if you perform a build for a semi-transparent way. For instance, if you perform a build for a
<literal>powerpc-darwin</literal> on an <literal>i686-linux</literal> <literal>x86_64-darwin</literal> on an <literal>i686-linux</literal>
machine, Nix can automatically forward the build to a machine, Nix can automatically forward the build to a
<literal>powerpc-darwin</literal> machine, if available.</para> <literal>x86_64-darwin</literal> machine, if available.</para>
<para>You can enable distributed builds by setting the environment <para>You can enable distributed builds by setting the environment
variable <envar>NIX_BUILD_HOOK</envar> to point to a program that Nix variable <envar>NIX_BUILD_HOOK</envar> to point to a program that Nix
@ -30,7 +30,7 @@ variable</link>.</para>
<example xml:id='ex-remote-systems'><title>Remote machine configuration: <example xml:id='ex-remote-systems'><title>Remote machine configuration:
<filename>remote-systems.conf</filename></title> <filename>remote-systems.conf</filename></title>
<programlisting> <programlisting>
nix@mcflurry.labs.cs.uu.nl powerpc-darwin /home/nix/.ssh/id_quarterpounder_auto 2 nix@mcflurry.labs.cs.uu.nl x86_64-darwin /home/nix/.ssh/id_quarterpounder_auto 2
nix@scratchy.labs.cs.uu.nl i686-linux /home/nix/.ssh/id_scratchy_auto 8 1 kvm nix@scratchy.labs.cs.uu.nl i686-linux /home/nix/.ssh/id_scratchy_auto 8 1 kvm
nix@itchy.labs.cs.uu.nl i686-linux /home/nix/.ssh/id_scratchy_auto 8 2 nix@itchy.labs.cs.uu.nl i686-linux /home/nix/.ssh/id_scratchy_auto 8 2
nix@poochie.labs.cs.uu.nl i686-linux /home/nix/.ssh/id_scratchy_auto 8 2 kvm perf nix@poochie.labs.cs.uu.nl i686-linux /home/nix/.ssh/id_scratchy_auto 8 2 kvm perf
@ -59,7 +59,7 @@ bits of information:
<filename>~/.ssh/config</filename>.</para></listitem> <filename>~/.ssh/config</filename>.</para></listitem>
<listitem><para>A comma-separated list of Nix platform type <listitem><para>A comma-separated list of Nix platform type
identifiers, such as <literal>powerpc-darwin</literal>. It is identifiers, such as <literal>x86_64-darwin</literal>. It is
possible for a machine to support multiple platform types, e.g., possible for a machine to support multiple platform types, e.g.,
<literal>i686-linux,x86_64-linux</literal>.</para></listitem> <literal>i686-linux,x86_64-linux</literal>.</para></listitem>

6
doc/manual/command-ref/conf-file.xml
View file

@ -430,15 +430,15 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para>
<listitem><para>This option specifies the canonical Nix system <listitem><para>This option specifies the canonical Nix system
name of the current installation, such as name of the current installation, such as
<literal>i686-linux</literal> or <literal>i686-linux</literal> or
<literal>powerpc-darwin</literal>. Nix can only build derivations <literal>x86_64-darwin</literal>. Nix can only build derivations
whose <literal>system</literal> attribute equals the value whose <literal>system</literal> attribute equals the value
specified here. In general, it never makes sense to modify this specified here. In general, it never makes sense to modify this
value from its default, since you can use it to ‘lie’ about the value from its default, since you can use it to ‘lie’ about the
platform you are building on (e.g., perform a Mac OS build on a platform you are building on (e.g., perform a Mac OS build on a
Linux machine; the result would obviously be wrong). It only Linux machine; the result would obviously be wrong). It only
makes sense if the Nix binaries can run on multiple platforms, makes sense if the Nix binaries can run on multiple platforms,
e.g., ‘universal binaries’ that run on <literal>powerpc-darwin</literal> and e.g., ‘universal binaries’ that run on <literal>x86_64-linux</literal> and
<literal>i686-darwin</literal>.</para> <literal>i686-linux</literal>.</para>
<para>It defaults to the canonical Nix system name detected by <para>It defaults to the canonical Nix system name detected by
<filename>configure</filename> at build time.</para></listitem> <filename>configure</filename> at build time.</para></listitem>

2
doc/manual/expressions/builtins.xml
View file

@ -142,7 +142,7 @@ if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting>
evaluates to the Nix platform identifier for the Nix installation evaluates to the Nix platform identifier for the Nix installation
on which the expression is being evaluated, such as on which the expression is being evaluated, such as
<literal>"i686-linux"</literal> or <literal>"i686-linux"</literal> or
<literal>"powerpc-darwin"</literal>.</para></listitem> <literal>"x86_64-darwin"</literal>.</para></listitem>
</varlistentry> </varlistentry>

2
doc/manual/expressions/derivations.xml
View file

@ -16,7 +16,7 @@ of which specify the inputs of the build.</para>
<listitem xml:id="attr-system"><para>There must be an attribute named <listitem xml:id="attr-system"><para>There must be an attribute named
<varname>system</varname> whose value must be a string specifying a <varname>system</varname> whose value must be a string specifying a
Nix platform identifier, such as <literal>"i686-linux"</literal> or Nix platform identifier, such as <literal>"i686-linux"</literal> or
<literal>"powerpc-darwin"</literal><footnote><para>To figure out <literal>"x86_64-darwin"</literal><footnote><para>To figure out
your platform identifier, look at the line <quote>Checking for the your platform identifier, look at the line <quote>Checking for the
canonical Nix system name</quote> in the output of Nix's canonical Nix system name</quote> in the output of Nix's
<filename>configure</filename> script.</para></footnote> The build <filename>configure</filename> script.</para></footnote> The build