Skip to content

stdenv: fix __bootPackages when overriding #136804

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

Closed
r-burns wants to merge 1 commit into from
Closed

stdenv: fix __bootPackages when overriding #136804

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: 1 addition & 1 deletion pkgs/stdenv/booter.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ stageFuns: let
folder = nextStage: stageFun: prevStage: let
args = stageFun prevStage;
args' = args // {
stdenv = args.stdenv // {
stdenv = args.stdenv.override {
# For debugging
__bootPackages = prevStage;
__hatPackages = nextStage;
Expand Down
6 changes: 6 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 @@ -52,6 +52,10 @@ let lib = import ../../../lib; in lib.makeOverridable (
, # The implementation of `mkDerivation`, parameterized with the final stdenv so we can tie the knot.
# This is convient to have as a parameter so the stdenv "adapters" work better
mkDerivationFromStdenv ? import ./make-derivation.nix { inherit lib config; }

# previous / next stage for debugging, see stdenv/booter.nix
, __bootPackages ? null
, __hatPackages ? null
}:

let
Expand Down Expand Up @@ -166,6 +170,8 @@ let
inherit overrides;

inherit cc hasCC;

inherit __bootPackages __hatPackages;
}

# Propagate any extra attributes. For instance, we use this to
Expand Down