aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-04-23 08:48:22 -0400
committerShea Levy <shea@shealevy.com>2018-04-23 08:48:22 -0400
commit8e6108ff71caae180d764ab9e9bff5593724655c (patch)
tree22506136f8e27474705bb96e1ac13cec5cef5971 /doc
parente2b028353b198d1590ee14101dbb74cd2a4c5730 (diff)
parent639c166647ae733e927ae589864d996bb2d95b88 (diff)
Merge branch 'aarch64-armv7' of git://github.com/lheckemann/nix
Support extra compatible architectures (#1916)
Diffstat (limited to 'doc')
-rw-r--r--doc/manual/command-ref/conf-file.xml19
1 files changed, 19 insertions, 0 deletions
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml
index 431c0e6d3..1865bb37c 100644
--- a/doc/manual/command-ref/conf-file.xml
+++ b/doc/manual/command-ref/conf-file.xml
@@ -254,6 +254,25 @@ false</literal>.</para>
</varlistentry>
+ <varlistentry xml:id="conf-extra-platforms"><term><literal>extra-platforms</literal></term>
+
+ <listitem><para>Platforms other than the native one which
+ this machine is capable of building for. This can be useful for
+ supporting additional architectures on compatible machines:
+ i686-linux can be built on x86_64-linux machines (and the default
+ for this setting reflects this); armv7 is backwards-compatible with
+ armv6 and armv5tel; some aarch64 machines can also natively run
+ 32-bit ARM code; and qemu-user may be used to support non-native
+ platforms (though this may be slow and buggy). Most values for this
+ are not enabled by default because build systems will often
+ misdetect the target platform and generate incompatible code, so you
+ may wish to cross-check the results of using this option against
+ proper natively-built versions of your
+ derivations.</para></listitem>
+
+ </varlistentry>
+
+
<varlistentry xml:id="conf-extra-substituters"><term><literal>extra-substituters</literal></term>
<listitem><para>Additional binary caches appended to those