diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2021-01-29 20:22:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 20:22:12 +0100 |
| commit | aa48e205a2e0516ff4b96c79eeb666aaaccd418c (patch) | |
| tree | 4e8f6542985139c8e498057dcbdbfd6fea0c3648 /pkgs/os-specific | |
| parent | 417b19df406ae6106d80a6c551787cd13d0299dd (diff) | |
| parent | 577d58a8e01aead5eb237d39a6d7df1fb7aa00c4 (diff) | |
Merge pull request #110787 from tfc/cartesian-product
lib/attrsets: add cartesianProductOfSets function
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/solo5/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index 2dbeca98051d..19d1aa3b5ebe 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -50,10 +50,11 @@ in stdenv.mkDerivation { homepage = "https://github.com/solo5/solo5"; license = licenses.isc; maintainers = [ maintainers.ehmry ]; - platforms = lib.crossLists (arch: os: "${arch}-${os}") [ - [ "aarch64" "x86_64" ] - [ "freebsd" "genode" "linux" "openbsd" ] - ]; + platforms = builtins.map ({arch, os}: "${arch}-${os}") + (cartesianProductOfSets { + arch = [ "aarch64" "x86_64" ]; + os = [ "freebsd" "genode" "linux" "openbsd" ]; + }); }; } |