diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2024-03-11 16:59:16 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2024-03-11 17:02:59 +0100 |
| commit | ab56d3ac71433e7a2cbe4101e17cff9c9acefc43 (patch) | |
| tree | 5451f1c26464530fb466fa9341ae2af8243e7023 /pkgs/stdenv/generic | |
| parent | 9336998b519fa62fa13ec0e2c770ff0178d6c3d6 (diff) | |
| download | nixlib-ab56d3ac71433e7a2cbe4101e17cff9c9acefc43.tar nixlib-ab56d3ac71433e7a2cbe4101e17cff9c9acefc43.tar.gz nixlib-ab56d3ac71433e7a2cbe4101e17cff9c9acefc43.tar.bz2 nixlib-ab56d3ac71433e7a2cbe4101e17cff9c9acefc43.tar.lz nixlib-ab56d3ac71433e7a2cbe4101e17cff9c9acefc43.tar.xz nixlib-ab56d3ac71433e7a2cbe4101e17cff9c9acefc43.tar.zst nixlib-ab56d3ac71433e7a2cbe4101e17cff9c9acefc43.zip | |
make-derivation.nix: Move into let binding
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 6a53d519045c..3effa8fce49f 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -40,6 +40,12 @@ let unique ; + mkDerivation = + fnOrAttrs: + if builtins.isFunction fnOrAttrs + then makeDerivationExtensible fnOrAttrs + else makeDerivationExtensibleConst fnOrAttrs; + checkMeta = import ./check-meta.nix { inherit lib config; # Nix itself uses the `system` field of a derivation to decide where @@ -603,7 +609,4 @@ extendDerivation (derivation (derivationArg // optionalAttrs envIsExportable checkedEnv)); in - fnOrAttrs: - if builtins.isFunction fnOrAttrs - then makeDerivationExtensible fnOrAttrs - else makeDerivationExtensibleConst fnOrAttrs + mkDerivation |