diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-25 16:51:18 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-09 12:44:48 +0200 |
| commit | 0a8605ded168751dbe8bcd0d00d1e38b9d1feded (patch) | |
| tree | 543b8afbfc19d4780805c13067619c0eb2de2f96 /pkgs/stdenv/generic | |
| parent | 37889e2b5ea444fce8a48fe3bf9250c9ddafa7d0 (diff) | |
| download | nixlib-0a8605ded168751dbe8bcd0d00d1e38b9d1feded.tar nixlib-0a8605ded168751dbe8bcd0d00d1e38b9d1feded.tar.gz nixlib-0a8605ded168751dbe8bcd0d00d1e38b9d1feded.tar.bz2 nixlib-0a8605ded168751dbe8bcd0d00d1e38b9d1feded.tar.lz nixlib-0a8605ded168751dbe8bcd0d00d1e38b9d1feded.tar.xz nixlib-0a8605ded168751dbe8bcd0d00d1e38b9d1feded.tar.zst nixlib-0a8605ded168751dbe8bcd0d00d1e38b9d1feded.zip | |
Formatting
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 0d8355e89cc3..039ac76e406c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -23,7 +23,7 @@ let # {pkgs, ...}: # { # allowUnfree = false; - # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayero-" x.name); + # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayer-" x.name); # } allowUnfreePredicate = config.allowUnfreePredicate or (x: false); @@ -74,7 +74,9 @@ let unsafeGetAttrPos "name" attrs; 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) && !(allowUnfreePredicate attrs) then + if !allowUnfree + && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) + && !allowUnfreePredicate attrs then throw '' Package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate. You can set { nixpkgs.config.allowUnfree = true; } |