Skip to content

stdenv: use disallowedRequisites to check forbidden requisites #168590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Artturin merged 1 commit into from Jul 17, 2022
Merged

stdenv: use disallowedRequisites to check forbidden requisites #168590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkgs/stdenv/generic/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions pkgs/stdenv/linux/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down