b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
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:
Peter Simons 2015-08-19 23:36:23 +02:00
parent bbc7812d37
commit 81ce9be104
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,6 +131,8 @@ let
else true;
in
assert licenseAllowed attrs;
lib.addPassthru (derivation (
(removeAttrs attrs
["meta" "passthru" "crossAttrs" "pos"
@ -150,7 +152,7 @@ let
computedPropagatedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs));
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)];
stdenv = result;
system = result.system;