-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'aarch64-armv7' of git://github.com/lheckemann/nix
Support extra compatible architectures (#1916)
- Loading branch information
Showing
5 changed files
with
35 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -98,7 +98,9 @@ int main (int argc, char * * argv) | |
source >> drvPath; | ||
auto requiredFeatures = readStrings<std::set<std::string>>(source); | ||
|
||
auto canBuildLocally = amWilling && (neededSystem == settings.thisSystem); | ||
auto canBuildLocally = amWilling | ||
&& ( neededSystem == settings.thisSystem | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
lheckemann
Member
|
||
|| settings.extraPlatforms.get().count(neededSystem) > 0); | ||
|
||
/* Error ignored here, will be caught later */ | ||
mkdir(currentLoad.c_str(), 0777); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -295,6 +295,13 @@ public: | |
"Nix store has a valid signature (that is, one signed using a key " | ||
"listed in 'trusted-public-keys'."}; | ||
|
||
Setting<StringSet> extraPlatforms{this, | ||
SYSTEM == "x86_64-linux" ? 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 " | ||
"or using hacks like qemu-user."}; | ||
|
||
This comment has been minimized.
Sorry, something went wrong.
dezgeg
Contributor
|
||
Setting<Strings> substituters{this, | ||
nixStore == "/nix/store" ? Strings{"https://cache.nixos.org/"} : Strings(), | ||
"substituters", | ||
|
small nit-- is the whitespace here intentional?