diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-14 18:01:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-14 18:01:26 +0000 |
| commit | c160165e60610632d9301c7a81096ddd28084be4 (patch) | |
| tree | 26a0211ff9f4a70272acf6503c1f03fdd85e3ef7 /pkgs/stdenv/adapters.nix | |
| parent | 0b0f7e2861f6ab204bee3ada5216a130d42e2816 (diff) | |
| parent | 4ff4273dbc8fd7d8d91a63fb60364aa6f1576611 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 2ec6a6c07c3ee..ed96ef408a3f4 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -6,7 +6,7 @@ let # N.B. Keep in sync with default arg for stdenv/generic. - defaultMkDerivationFromStdenv = import ./generic/make-derivation.nix { inherit lib config; }; + defaultMkDerivationFromStdenv = stdenv: (import ./generic/make-derivation.nix { inherit lib config; } stdenv).mkDerivation; # Low level function to help with overriding `mkDerivationFromStdenv`. One # gives it the old stdenv arguments and a "continuation" function, and |