diff options
| author | John Ericson <git@JohnEricson.me> | 2020-09-01 22:31:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 22:31:16 -0400 |
| commit | 1965a241fc2476ff63e8b97019a3db58707a8325 (patch) | |
| tree | 7e5efc37712cd6e72c85ee08a5b2a6965c3b4f6a /lib/systems/default.nix | |
| parent | 54eacc77f7e8fd20db467f1363fee937ca8f5fa1 (diff) | |
| parent | c5fe132b3c5da5044c01a9bd4aa4ab45795cb9e6 (diff) | |
| download | nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.gz nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.bz2 nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.lz nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.xz nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.zst nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.zip | |
Merge pull request #61019 from volth/gcc.arch-amd
platform.gcc.arch: support for AMD CPUs
Diffstat (limited to 'lib/systems/default.nix')
| -rw-r--r-- | lib/systems/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 09884d40682..9939743157e 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -7,6 +7,7 @@ rec { inspect = import ./inspect.nix { inherit lib; }; platforms = import ./platforms.nix { inherit lib; }; examples = import ./examples.nix { inherit lib; }; + architectures = import ./architectures.nix { inherit lib; }; # Elaborate a `localSystem` or `crossSystem` so that it contains everything # necessary. @@ -126,6 +127,7 @@ rec { else throw "Don't know how to run ${final.config} executables."; } // mapAttrs (n: v: v final.parsed) inspect.predicates + // mapAttrs (n: v: v final.platform.gcc.arch or "default") architectures.predicates // args; in assert final.useAndroidPrebuilt -> final.isAndroid; assert lib.foldl |