3
0
Fork 0
forked from mirrors/nixpkgs

stdenv: use disallowedRequisites to check forbidden requisites

This commit is contained in:
Adam Joseph 2022-04-13 23:13:33 -07:00
parent dfc7a39803
commit 9d60e3dd29
2 changed files with 4 additions and 0 deletions

View file

@ -11,6 +11,7 @@ argsStdenv@{ name ? "stdenv", preHook ? "", initialPath
, shell
, allowedRequisites ? null, extraAttrs ? {}, overrides ? (self: super: {}), config
, disallowedRequisites ? []
, # The `fetchurl' to use for downloading curl and its dependencies
# (see all-packages.nix).
@ -97,6 +98,7 @@ let
}
// {
inherit name;
inherit disallowedRequisites;
# Nix itself uses the `system` field of a derivation to decide where to
# build it. This is a bit confusing for cross compilation.

View file

@ -404,6 +404,8 @@ in
shellPackage = prevStage.bash;
};
disallowedRequisites = [ bootstrapTools.out ];
# Mainly avoid reference to bootstrap tools
allowedRequisites = with prevStage; with lib;
# Simple executable tools