diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-23 18:43:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-23 18:43:23 +0200 |
| commit | d91ee29e401c31ffabc4e8ced4f55ab0f9bab53e (patch) | |
| tree | 35f9eef0a218dfc7028e53151bfd2211213f3cd0 | |
| parent | 76786cd4fc7b52d842d2d3813163167867eca0f0 (diff) | |
| parent | 2a7e1e022894a320c433047e8424fe0f1a05a9a1 (diff) | |
Merge pull request #222742 from wegank/patterns-fix
stdenv: fix error with patterned platforms
| -rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 178367f6061d7..4c218b24d11d7 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -113,6 +113,7 @@ let showLicenseOrSourceType = value: toString (map (v: v.shortName or "unknown") (lib.lists.toList value)); showLicense = showLicenseOrSourceType; + showPlatforms = value: lib.optionalString (builtins.isList value && builtins.all builtins.isString value) (toString value); showSourceType = showLicenseOrSourceType; pos_str = meta: meta.position or "«unknown-file»"; @@ -368,7 +369,7 @@ let else if !allowBroken && attrs.meta.broken or false then { valid = "no"; reason = "broken"; errormsg = "is marked as broken"; } else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then - { valid = "no"; reason = "unsupported"; errormsg = "is only supported on `${toString attrs.meta.platforms}` but not on requested ‘${hostPlatform.system}’"; } + { valid = "no"; reason = "unsupported"; errormsg = "is only supported on `${showPlatforms attrs.meta.platforms}` but not on requested ‘${hostPlatform.system}’"; } else if !(hasAllowedInsecure attrs) then { valid = "no"; reason = "insecure"; errormsg = "is marked as insecure"; } |