alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #9305 from Mathnerd314/broken-fix

Browse source 
Move licenseAllowed check into the builder attribute (fixes #7541)
This commit is contained in:
Peter Simons 2015-08-19 22:08:24 +02:00
parent 24664e9cb3 4d6452bab9
commit 082b0ee2a1
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;
in
assert licenseAllowed attrs;
lib.addPassthru (derivation (
(removeAttrs attrs
["meta" "passthru" "crossAttrs" "pos"
@ -152,7 +150,7 @@ let
computedPropagatedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs));
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)];
stdenv = result;
system = result.system;