diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2021-10-21 20:17:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-21 20:17:32 +0200 |
| commit | 98f82e9c35aaf1eb32f0d8787e948da5ca970449 (patch) | |
| tree | 60446a73a2625683e671f9c9b243da6dd3094fde /pkgs/build-support | |
| parent | 89776ad3ab861664040605c8f6fc92836f51d440 (diff) | |
| parent | dc895fb2815032adbcc49f090812fa355074d9be (diff) | |
Merge pull request #141789 from pennae/eval-opt
lib: make extendDerivation lighter on eval
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/buildenv/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index c2186cf6bfa04..006fc2aff9232 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -62,7 +62,7 @@ runCommand name # and otherwise use `meta.outputsToInstall`. The attribute is guaranteed # to exist in mkDerivation-created cases. The other cases (e.g. runCommand) # aren't expected to have multiple outputs. - (if drv.outputUnspecified or false + (if (! drv ? outputSpecified || ! drv.outputSpecified) && drv.meta.outputsToInstall or null != null then map (outName: drv.${outName}) drv.meta.outputsToInstall else [ drv ]) |