diff options
| author | Wout Mertens <Wout.Mertens@gmail.com> | 2015-01-29 10:54:07 +0100 |
|---|---|---|
| committer | Wout Mertens <Wout.Mertens@gmail.com> | 2015-01-29 10:54:07 +0100 |
| commit | ef2e0ffdea34acbe6743d1c2a6f0f7f7680bb91f (patch) | |
| tree | 0a9924cb9fb0cbd29e1475e6e2a16c9c6e036438 /pkgs/stdenv/generic/default.nix | |
| parent | 857f32dfe77bc774f51e7d88161a3a64eb0043f7 (diff) | |
| download | nixpkgs-ef2e0ffdea34acbe6743d1c2a6f0f7f7680bb91f.tar nixpkgs-ef2e0ffdea34acbe6743d1c2a6f0f7f7680bb91f.tar.gz nixpkgs-ef2e0ffdea34acbe6743d1c2a6f0f7f7680bb91f.tar.bz2 nixpkgs-ef2e0ffdea34acbe6743d1c2a6f0f7f7680bb91f.tar.lz nixpkgs-ef2e0ffdea34acbe6743d1c2a6f0f7f7680bb91f.tar.xz nixpkgs-ef2e0ffdea34acbe6743d1c2a6f0f7f7680bb91f.tar.zst nixpkgs-ef2e0ffdea34acbe6743d1c2a6f0f7f7680bb91f.zip | |
stdenv: fix eval - the return
Diffstat (limited to 'pkgs/stdenv/generic/default.nix')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 6793e5c5688..086c0b45706 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -108,9 +108,9 @@ let licenseAllowed = attrs: if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then - throwEvalHelp "Unfree" "has an unfree license ‘${attrs.meta.license.shortName}’ which is not whitelisted" + throwEvalHelp "Unfree" "has an unfree license ‘${builtins.toJSON attrs.meta.license}’ which is not whitelisted" else if hasBlacklistedLicense attrs then - throwEvalHelp "blacklisted" "has the ‘${attrs.meta.license.shortName}’ license which is blacklisted" + throwEvalHelp "blacklisted" "has the ‘${builtins.toJSON attrs.meta.license}’ license which is blacklisted" else if !allowBroken && attrs.meta.broken or false then throwEvalHelp "Broken" "is marked as broken" else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then |