diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2024-03-11 17:06:02 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2024-03-11 17:06:02 +0100 |
| commit | de516f6f130ff744c14dc1c58fbb428fa4bb3794 (patch) | |
| tree | bb632eb56973c6667d5b4536f10c909d1b073cf9 /pkgs/stdenv | |
| parent | ab56d3ac71433e7a2cbe4101e17cff9c9acefc43 (diff) | |
make-derivation.nix: Return mkDerivation as an attribute
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 84d3258949eb..10ed96acc209 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 diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index e764571869db..2cda43d5632f 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -52,7 +52,7 @@ argsStdenv@{ name ? "stdenv", preHook ? "", initialPath , # 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; } + mkDerivationFromStdenv ? stdenv: (import ./make-derivation.nix { inherit lib config; } stdenv).mkDerivation }: let diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 3effa8fce49f..8d1dc6bdeab7 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -609,4 +609,6 @@ extendDerivation (derivation (derivationArg // optionalAttrs envIsExportable checkedEnv)); in - mkDerivation +{ + inherit mkDerivation; +} |