diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2013-01-27 11:32:12 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-01-27 11:32:12 +0100 |
| commit | 3b26ba70197f8a420e85def67582aab7799427d8 (patch) | |
| tree | e24b777cff4da6b7046ab18b335fc94cc9d22dce /pkgs/stdenv | |
| parent | 0214514f8b20806236969e3ca0125eafe5836a41 (diff) | |
| parent | bff4b066401e7b61d37a4a038f7c9722f796d860 (diff) | |
| download | nixlib-3b26ba70197f8a420e85def67582aab7799427d8.tar nixlib-3b26ba70197f8a420e85def67582aab7799427d8.tar.gz nixlib-3b26ba70197f8a420e85def67582aab7799427d8.tar.bz2 nixlib-3b26ba70197f8a420e85def67582aab7799427d8.tar.lz nixlib-3b26ba70197f8a420e85def67582aab7799427d8.tar.xz nixlib-3b26ba70197f8a420e85def67582aab7799427d8.tar.zst nixlib-3b26ba70197f8a420e85def67582aab7799427d8.zip | |
Merge remote-tracking branch 'central/master' into stdenv-updates
Conflicts: pkgs/os-specific/linux/alsa-utils/default.nix
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 e7e1f6441d85..c54a66423a5b 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 && attrs.meta.license or "" == "unfree" then + if !allowUnfree && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable") then throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate" else (derivation ( |