stdenv.hasLicense: ? supports nested lookup

this avoids one copy of the attrset
2016-10-22 02:10:38 +02:00 · 2016-10-22 02:10:38 +02:00 · 43ce115ca9
commit 43ce115ca9
parent 89672d530b
1 changed files with 1 additions and 1 deletions
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@ -44,7 +44,7 @@ let
      throw "whitelistedLicenses and blacklistedLicenses are not mutually exclusive.";

  hasLicense = attrs:
-    builtins.hasAttr "meta" attrs && builtins.hasAttr "license" attrs.meta;
+    attrs ? meta.license;

  hasWhitelistedLicense = assert areLicenseListsValid; attrs:
    hasLicense attrs && builtins.elem attrs.meta.license whitelist;