diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-06-17 10:26:52 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-06-17 10:26:52 +0200 |
| commit | 1524752c17ee8753467f068c23fbe1d994aa8f75 (patch) | |
| tree | c802ca482e2461765dcbdcef5cc6fa38c9d1c42b /src/libstore/globals.hh | |
| parent | 7db879e65e83b1c65206b490d36a69e97c5a877a (diff) | |
| parent | 29542865cee37ab22efe1bd142900b69f6c59f0d (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/libstore/globals.hh')
| -rw-r--r-- | src/libstore/globals.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 8099aa150..699abf353 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -271,7 +271,7 @@ public: "listed in 'trusted-public-keys'."}; Setting<StringSet> extraPlatforms{this, - std::string{SYSTEM} == "x86_64-linux" ? StringSet{"i686-linux"} : StringSet{}, + std::string{SYSTEM} == "x86_64-linux" && !isWSL1() ? StringSet{"i686-linux"} : StringSet{}, "extra-platforms", "Additional platforms that can be built on the local system. " "These may be supported natively (e.g. armv7 on some aarch64 CPUs " |