From 4da12f050a2163b7f5a24c092deb9b8882e07576 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Tue, 28 Apr 2026 12:49:17 -0400 Subject: [PATCH] stdenv/check-meta: call containsLicenses early with list --- pkgs/stdenv/generic/check-meta.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index e9923aa995c9..404debbf1b06 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -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 );