diff options
| author | Adam Joseph <adam@westernsemico.com> | 2022-04-13 23:13:33 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2022-04-13 23:13:33 -0700 |
| commit | 9d60e3dd29cf2d95f707223bedcb3260716911f9 (patch) | |
| tree | 479f863ec8e15b73912255634b9fde4f4e273680 /pkgs | |
| parent | dfc7a3980383e1d55b106118eb768648d234e9e6 (diff) | |
| download | nixpkgs-9d60e3dd29cf2d95f707223bedcb3260716911f9.tar nixpkgs-9d60e3dd29cf2d95f707223bedcb3260716911f9.tar.gz nixpkgs-9d60e3dd29cf2d95f707223bedcb3260716911f9.tar.bz2 nixpkgs-9d60e3dd29cf2d95f707223bedcb3260716911f9.tar.lz nixpkgs-9d60e3dd29cf2d95f707223bedcb3260716911f9.tar.xz nixpkgs-9d60e3dd29cf2d95f707223bedcb3260716911f9.tar.zst nixpkgs-9d60e3dd29cf2d95f707223bedcb3260716911f9.zip | |
stdenv: use disallowedRequisites to check forbidden requisites
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 4fb98e5e801..66a95759968 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -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. diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index d2c28b97ff9..dfba741673c 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -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 |