Revert "Move licenseAllowed check into the builder attribute (fixes #7541)"
This reverts commit 4d6452ba
. The change affects Hydra in a way we didn't
expect: https://github.com/NixOS/nixpkgs/pull/9305#issuecomment-132791730.
This commit is contained in:
parent
bbc7812d37
commit
81ce9be104
|
@ -131,6 +131,8 @@ 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"
|
||||||
|
@ -150,7 +152,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 = assert licenseAllowed attrs; attrs.realBuilder or shell;
|
builder = 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;
|
||||||
|
|
Loading…
Reference in a new issue