diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2016-10-24 15:19:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-24 15:19:12 +0200 |
| commit | 3d5630fac9c918ea66e230a779e3d968750a3cf1 (patch) | |
| tree | 9f917c2396bd925ca8e7b6c9dd8c0c20ebd208fe | |
| parent | a953b6c1ca98c848b77c49785c7ac6a2196a6ea7 (diff) | |
| parent | 43ce115ca91d34af1640f9ece2e5526e44dd2c7e (diff) | |
| download | nixpkgs-3d5630fac9c918ea66e230a779e3d968750a3cf1.tar nixpkgs-3d5630fac9c918ea66e230a779e3d968750a3cf1.tar.gz nixpkgs-3d5630fac9c918ea66e230a779e3d968750a3cf1.tar.bz2 nixpkgs-3d5630fac9c918ea66e230a779e3d968750a3cf1.tar.lz nixpkgs-3d5630fac9c918ea66e230a779e3d968750a3cf1.tar.xz nixpkgs-3d5630fac9c918ea66e230a779e3d968750a3cf1.tar.zst nixpkgs-3d5630fac9c918ea66e230a779e3d968750a3cf1.zip | |
Merge pull request #19769 from groxxda/license
stdenv.hasLicense: ? supports nested lookup
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 978da2e1907..c1a341dd6fa 100644 --- 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; |