From de516f6f130ff744c14dc1c58fbb428fa4bb3794 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 11 Mar 2024 17:06:02 +0100 Subject: make-derivation.nix: Return mkDerivation as an attribute --- pkgs/stdenv/generic/default.nix | 2 +- pkgs/stdenv/generic/make-derivation.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/stdenv/generic') diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index e764571869db6..2cda43d5632f2 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 3effa8fce49f6..8d1dc6bdeab7f 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; +} -- cgit 1.4.1