From 1b00adbad171384b99ad842684d4f5e58e6657a2 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 5 Jun 2022 13:33:35 +0200 Subject: pkgs/make-derivation.nix: Refactor, introduce let binding --- pkgs/stdenv/generic/make-derivation.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pkgs/stdenv/generic') diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 395c1586a26b4..075012d6e0fb4 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -70,9 +70,7 @@ let makeDerivationExtensible mkDerivationSimple (self: attrs // f self attrs)) attrs; -in - -makeOverlayable (overrideAttrs: + mkDerivationSimple = overrideAttrs: # `mkDerivation` wraps the builtin `derivation` function to @@ -485,6 +483,7 @@ lib.extendDerivation # should be made available to Nix expressions using the # derivation (e.g., in assertions). passthru) - (derivation derivationArg) + (derivation derivationArg); -) +in + makeOverlayable mkDerivationSimple -- cgit 1.4.1