diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-15 13:36:34 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-15 13:36:34 +0100 |
| commit | 2aa6f262cbb2052d604874223549ca44fd448a67 (patch) | |
| tree | 6a70e96bb9d87365f4bcbf8c58025a0d93c96078 /pkgs/stdenv | |
| parent | f9e75352cf610360d43806bb09671d013c881cc9 (diff) | |
| parent | 1a52c7659dda87a8186d2a5482e49170b3989afa (diff) | |
| download | nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.gz nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.bz2 nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.lz nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.xz nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.zst nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/stdenv')
| -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 c54a66423a5b..6f5e5d34582f 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -41,7 +41,7 @@ let # Add a utility function to produce derivations that use this # stdenv and its shell. mkDerivation = attrs: - if !allowUnfree && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable") then + if !allowUnfree && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable" || l == lib.licenses.proprietary) then throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate" else (derivation ( |