dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Move licenseAllowed check into the builder attribute (fixes #7541)

Browse Source
This commit is contained in:
Mathnerd314 2015-08-17 10:31:22 -06:00
parent 0ccf8eae2f
commit 4d6452bab9
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/generic/default.nix
View File

@ -131,8 +131,6 @@ let
else true; else true;
in in
assert licenseAllowed attrs;
lib.addPassthru (derivation ( lib.addPassthru (derivation (
(removeAttrs attrs (removeAttrs attrs
["meta" "passthru" "crossAttrs" "pos" ["meta" "passthru" "crossAttrs" "pos"
@ -152,7 +150,7 @@ let
computedPropagatedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs)); computedPropagatedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs));
in in
{ {
builder = attrs.realBuilder or shell; builder = assert licenseAllowed attrs; attrs.realBuilder or shell;
args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
stdenv = result; stdenv = result;
system = result.system; system = result.system;