Merge pull request #168590 from amjoseph-nixpkgs/stdenv-disallowedReferences
stdenv: use disallowedRequisites to check forbidden requisites
This commit is contained in:
commit
111abd87ca
|
@ -11,6 +11,7 @@ argsStdenv@{ name ? "stdenv", preHook ? "", initialPath
|
||||||
|
|
||||||
, shell
|
, shell
|
||||||
, allowedRequisites ? null, extraAttrs ? {}, overrides ? (self: super: {}), config
|
, allowedRequisites ? null, extraAttrs ? {}, overrides ? (self: super: {}), config
|
||||||
|
, disallowedRequisites ? []
|
||||||
|
|
||||||
, # The `fetchurl' to use for downloading curl and its dependencies
|
, # The `fetchurl' to use for downloading curl and its dependencies
|
||||||
# (see all-packages.nix).
|
# (see all-packages.nix).
|
||||||
|
@ -97,6 +98,7 @@ let
|
||||||
}
|
}
|
||||||
// {
|
// {
|
||||||
inherit name;
|
inherit name;
|
||||||
|
inherit disallowedRequisites;
|
||||||
|
|
||||||
# Nix itself uses the `system` field of a derivation to decide where to
|
# Nix itself uses the `system` field of a derivation to decide where to
|
||||||
# build it. This is a bit confusing for cross compilation.
|
# build it. This is a bit confusing for cross compilation.
|
||||||
|
|
|
@ -421,6 +421,8 @@ in
|
||||||
shellPackage = prevStage.bash;
|
shellPackage = prevStage.bash;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
disallowedRequisites = [ bootstrapTools.out ];
|
||||||
|
|
||||||
# Mainly avoid reference to bootstrap tools
|
# Mainly avoid reference to bootstrap tools
|
||||||
allowedRequisites = with prevStage; with lib;
|
allowedRequisites = with prevStage; with lib;
|
||||||
# Simple executable tools
|
# Simple executable tools
|
||||||
|
|
Loading…
Reference in a new issue