alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #168590 from amjoseph-nixpkgs/stdenv-disallowedReferences

Browse source 
stdenv: use disallowedRequisites to check forbidden requisites
This commit is contained in:
Artturi 2022-07-18 02:51:23 +03:00 committed by GitHub
parent bf59183cb6 9d60e3dd29
commit 111abd87ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/stdenv/generic/default.nix
View file

@ -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.

2
pkgs/stdenv/linux/default.nix
View file

@ -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