From ed6b342fc3a76908afe4cd7cdbc0f6eaf33082da Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 24 Jan 2022 12:41:45 -0300 Subject: [PATCH 1/2] retroarchFull: use lib.meta.availableOn --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3eeadb5c4a8e..2b1abfda0aec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33482,7 +33482,7 @@ with pkgs; retroarchFull = retroarch.override { cores = builtins.filter # Remove cores not supported on platform - (c: c ? libretroCore && (builtins.elem stdenv.hostPlatform.system c.meta.platforms)) + (c: c ? libretroCore && (lib.meta.availableOn stdenv.hostPlatform c)) (builtins.attrValues libretro); }; From f0e9f54d6e27ef1960edaf306efebd42b94087c6 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 24 Jan 2022 12:45:43 -0300 Subject: [PATCH 2/2] lib/meta: fix typo in platformMatch comment --- lib/meta.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/meta.nix b/lib/meta.nix index bc3387646f26..5b1f7ee5ff2d 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -78,7 +78,7 @@ rec { 2. (modern) a pattern for the platform `parsed` field. - We can inject these into a patten for the whole of a structured platform, + We can inject these into a pattern for the whole of a structured platform, and then match that. */ platformMatch = platform: elem: let