From 4d6452bab925f448852f277be66adee1b33ddce7 Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Mon, 17 Aug 2015 10:31:22 -0600 Subject: [PATCH] Move licenseAllowed check into the builder attribute (fixes #7541) --- pkgs/stdenv/generic/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index fe7bec54ba0..19443e3e6ea 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -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;