summary refs log tree commit diff
path: root/pkgs/stdenv/generic
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-03-23 18:01:20 +0000
committerGitHub <noreply@github.com>2023-03-23 18:01:20 +0000
commit307b7194146f7aba544847f8a44abb164244bf1c (patch)
tree228165661e61d6ddd1cc861fda5d4a4269e8ae34 /pkgs/stdenv/generic
parentd6eaead385f7a770832eba6fbe242d3b97b058b4 (diff)
parent4a3d90135ba8d31ef4d5a19de23f7e74b9914d08 (diff)
downloadnixpkgs-307b7194146f7aba544847f8a44abb164244bf1c.tar
nixpkgs-307b7194146f7aba544847f8a44abb164244bf1c.tar.gz
nixpkgs-307b7194146f7aba544847f8a44abb164244bf1c.tar.bz2
nixpkgs-307b7194146f7aba544847f8a44abb164244bf1c.tar.lz
nixpkgs-307b7194146f7aba544847f8a44abb164244bf1c.tar.xz
nixpkgs-307b7194146f7aba544847f8a44abb164244bf1c.tar.zst
nixpkgs-307b7194146f7aba544847f8a44abb164244bf1c.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv/generic')
-rw-r--r--pkgs/stdenv/generic/check-meta.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 4b0ca649ee9..4c218b24d11 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 not supported on ‘${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"; }