Merge pull request #19769 from groxxda/license

stdenv.hasLicense: ? supports nested lookup
NixOS · Oct 24, 2016 · 3d5630f · 3d5630f
2 parents a953b6c + 43ce115
commit 3d5630f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;