mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
stdenv/check-meta: call containsLicenses early with list
This commit is contained in:
@@ -81,13 +81,17 @@ let
|
||||
|
||||
hasListedLicense =
|
||||
assert areLicenseListsValid;
|
||||
list: attrs:
|
||||
list:
|
||||
let
|
||||
containsListLicenses = lib.licenses.containsLicenses list;
|
||||
in
|
||||
attrs:
|
||||
attrs ? meta.license
|
||||
&& (
|
||||
if isList attrs.meta.license then
|
||||
any (l: elem l list) attrs.meta.license
|
||||
else if attrs.meta.license ? "licenseType" then
|
||||
lib.licenses.containsLicenses list attrs.meta.license
|
||||
containsListLicenses attrs.meta.license
|
||||
else
|
||||
elem attrs.meta.license list
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user