diff options
author | Robert Hensing <robert@roberthensing.nl> | 2022-06-05 13:36:56 +0200 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2022-06-05 13:36:56 +0200 |
commit | cd88f8613f3d8cd5a985c624cd3cf14459ddbed9 (patch) | |
tree | 6c783aa427dc4e91847bdfce48175c3d44cae76c /pkgs/stdenv | |
parent | 7e3c80f5b7db00252f3334d97a28d2c4800c8f41 (diff) |
pkgs/make-derivation.nix: Refactor, hardcode mkDerivationSimple
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 23e7d992bc2ae..5f1a22cee06f3 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -11,7 +11,7 @@ let }; # Based off lib.makeExtensible, with modifications: - makeDerivationExtensible = mkDerivationSimple: rattrs: + makeDerivationExtensible = rattrs: let # NOTE: The following is a hint that will be printed by the Nix cli when # encountering an infinite recursion. It must not be formatted into @@ -42,14 +42,14 @@ let f0 self super else x; in - makeDerivationExtensible mkDerivationSimple + makeDerivationExtensible (self: let super = rattrs self; in super // f self super)) args; in finalPackage; # makeDerivationExtensibleConst == makeDerivationExtensible (_: attrs), # but pre-evaluated for a slight improvement in performance. - makeDerivationExtensibleConst = mkDerivationSimple: attrs: + makeDerivationExtensibleConst = attrs: mkDerivationSimple (f0: let @@ -61,7 +61,7 @@ let f0 self super else x; in - makeDerivationExtensible mkDerivationSimple (self: attrs // f self attrs)) + makeDerivationExtensible (self: attrs // f self attrs)) attrs; mkDerivationSimple = overrideAttrs: @@ -482,5 +482,5 @@ lib.extendDerivation in fnOrAttrs: if builtins.isFunction fnOrAttrs - then makeDerivationExtensible mkDerivationSimple fnOrAttrs - else makeDerivationExtensibleConst mkDerivationSimple fnOrAttrs + then makeDerivationExtensible fnOrAttrs + else makeDerivationExtensibleConst fnOrAttrs |