systems/examples.nix: move riscv function to let binding
Makes it easier to use mapAttrs with lib.systems.examples. Now every entry in it are legitimate systems.
This commit is contained in:
parent
865cbd380d
commit
ce6d558c4d
|
@ -2,7 +2,14 @@
|
||||||
# `crossSystem`. They are put here for user convenience, but also used by cross
|
# `crossSystem`. They are put here for user convenience, but also used by cross
|
||||||
# tests and linux cross stdenv building, so handle with care!
|
# tests and linux cross stdenv building, so handle with care!
|
||||||
{ lib }:
|
{ lib }:
|
||||||
let platforms = import ./platforms.nix { inherit lib; }; in
|
let
|
||||||
|
platforms = import ./platforms.nix { inherit lib; };
|
||||||
|
|
||||||
|
riscv = bits: {
|
||||||
|
config = "riscv${bits}-unknown-linux-gnu";
|
||||||
|
platform = platforms.riscv-multiplatform bits;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
#
|
#
|
||||||
|
@ -92,10 +99,6 @@ rec {
|
||||||
musl64 = { config = "x86_64-unknown-linux-musl"; };
|
musl64 = { config = "x86_64-unknown-linux-musl"; };
|
||||||
musl32 = { config = "i686-unknown-linux-musl"; };
|
musl32 = { config = "i686-unknown-linux-musl"; };
|
||||||
|
|
||||||
riscv = bits: {
|
|
||||||
config = "riscv${bits}-unknown-linux-gnu";
|
|
||||||
platform = platforms.riscv-multiplatform bits;
|
|
||||||
};
|
|
||||||
riscv64 = riscv "64";
|
riscv64 = riscv "64";
|
||||||
riscv32 = riscv "32";
|
riscv32 = riscv "32";
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ rec {
|
||||||
# More poor man's memoisation
|
# More poor man's memoisation
|
||||||
pkgsForCross = let
|
pkgsForCross = let
|
||||||
examplesByConfig = lib.flip lib.mapAttrs'
|
examplesByConfig = lib.flip lib.mapAttrs'
|
||||||
(builtins.removeAttrs lib.systems.examples [ "riscv" ])
|
lib.systems.examples
|
||||||
(_: crossSystem: nameValuePair crossSystem.config {
|
(_: crossSystem: nameValuePair crossSystem.config {
|
||||||
inherit crossSystem;
|
inherit crossSystem;
|
||||||
pkgsFor = mkPkgsFor crossSystem;
|
pkgsFor = mkPkgsFor crossSystem;
|
||||||
|
|
Loading…
Reference in a new issue