diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-20 19:31:01 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-20 19:31:01 +0200 |
| commit | 4e8c2f0ff91c19065f44fd66c9d869b920631557 (patch) | |
| tree | fcdb6062bbcb33f4ed4013ed9b4a0020e166d948 /pkgs/stdenv | |
| parent | cb83796abb3870cf6dc74c4823067bc7b43a9395 (diff) | |
| parent | a0c0dfb6471506a1c4b98c8b6ec7a31271025573 (diff) | |
Merge branch 'systemd-update'
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 4ee9251f4bb8b..b0031178bbd42 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -58,16 +58,14 @@ let pos' = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»"; in if !allowUnfree && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) then - throw ''package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate. - You can set - { nixpkgs.config.allowUnfree = true; } - in configuration.nix to override this. - If you use Nix standalone, you can add - { config.allowUnfree = true; } - to ~/.nixpkgs/config.nix or pass - --arg config '{ allowUnfree = true; }' - on the command line. - '' + throw '' + Package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate. You can set + { nixpkgs.config.allowUnfree = true; } + in configuration.nix to override this. If you use Nix standalone, you can add + { config.allowUnfree = true; } + to ~/.nixpkgs/config.nix or pass + --arg config '{ allowUnfree = true; }' + on the command line.'' else if !allowBroken && attrs.meta.broken or false then throw "you can't use package ‘${attrs.name}’ in ${pos'} because it has been marked as broken" else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then |