diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2022-06-05 13:35:04 +0200 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2022-06-05 13:35:04 +0200 |
| commit | 7e3c80f5b7db00252f3334d97a28d2c4800c8f41 (patch) | |
| tree | 0cdf1ebac24da3d8461fa1e03fad33eb37ee3e9a /pkgs/stdenv | |
| parent | 1b00adbad171384b99ad842684d4f5e58e6657a2 (diff) | |
pkgs/make-derivation.nix: Refactor, inline makeOverlayable
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 075012d6e0fb4..23e7d992bc2ae 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -10,12 +10,6 @@ let inherit (stdenv) hostPlatform; }; - makeOverlayable = mkDerivationSimple: - fnOrAttrs: - if builtins.isFunction fnOrAttrs - then makeDerivationExtensible mkDerivationSimple fnOrAttrs - else makeDerivationExtensibleConst mkDerivationSimple fnOrAttrs; - # Based off lib.makeExtensible, with modifications: makeDerivationExtensible = mkDerivationSimple: rattrs: let @@ -486,4 +480,7 @@ lib.extendDerivation (derivation derivationArg); in - makeOverlayable mkDerivationSimple + fnOrAttrs: + if builtins.isFunction fnOrAttrs + then makeDerivationExtensible mkDerivationSimple fnOrAttrs + else makeDerivationExtensibleConst mkDerivationSimple fnOrAttrs |