wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-30 07:33:16 +02:00
Code Activity

Merge pull request #4310 from matthewbauer/rosetta2-extra-platforms

Browse source 
Add x86_64-darwin and aarch64 to "extra-platforms" automatically when Rosetta2 is detected
This commit is contained in:
Eelco Dolstra 2021-01-06 11:31:13 +01:00 • committed by GitHub
commit 3edcb198e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/globals.hh
View file

@ -34,6 +34,8 @@ class Settings : public Config {
StringSet getDefaultSystemFeatures();
StringSet getDefaultExtraPlatforms();
bool isWSL1();
public:
@ -545,7 +547,7 @@ public:
Setting<StringSet> extraPlatforms{
this,
std::string{SYSTEM} == "x86_64-linux" && !isWSL1() ? StringSet{"i686-linux"} : StringSet{},
getDefaultExtraPlatforms(),
"extra-platforms",
R"(
Platforms other than the native one which this machine is capable of