diff options
author | William A. Kennington III <william@wkennington.com> | 2015-08-19 20:52:17 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-08-19 20:52:17 -0700 |
commit | 4f22eadf2c3df65533e45df6e4f5a0115c15f51b (patch) | |
tree | a868a9101db7df81d33b1cd7e17dc5c27c707915 /pkgs/stdenv | |
parent | bf0da55a8c37eca933055dfffbe1ef3a3603ba22 (diff) | |
parent | 6f92c207953acc45083b69d111cc25bd7c45b98d (diff) | |
download | nixlib-4f22eadf2c3df65533e45df6e4f5a0115c15f51b.tar nixlib-4f22eadf2c3df65533e45df6e4f5a0115c15f51b.tar.gz nixlib-4f22eadf2c3df65533e45df6e4f5a0115c15f51b.tar.bz2 nixlib-4f22eadf2c3df65533e45df6e4f5a0115c15f51b.tar.lz nixlib-4f22eadf2c3df65533e45df6e4f5a0115c15f51b.tar.xz nixlib-4f22eadf2c3df65533e45df6e4f5a0115c15f51b.tar.zst nixlib-4f22eadf2c3df65533e45df6e4f5a0115c15f51b.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 19443e3e6eaf..fe7bec54ba02 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -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; |