diff options
Diffstat (limited to 'nixpkgs/pkgs/stdenv/generic/default.nix')
-rw-r--r-- | nixpkgs/pkgs/stdenv/generic/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/stdenv/generic/default.nix b/nixpkgs/pkgs/stdenv/generic/default.nix index 88ca1b2c7903..d7fb1b0ba063 100644 --- a/nixpkgs/pkgs/stdenv/generic/default.nix +++ b/nixpkgs/pkgs/stdenv/generic/default.nix @@ -48,6 +48,10 @@ let lib = import ../../../lib; in lib.makeOverridable ( , # The platform which build tools (especially compilers) build for in this stage, targetPlatform + +, # 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; } }: let @@ -155,9 +159,7 @@ let # to correct type of machine. inherit (hostPlatform) system; - inherit (import ./make-derivation.nix { - inherit lib config stdenv; - }) mkDerivation; + mkDerivation = mkDerivationFromStdenv stdenv; inherit fetchurlBoot; |