diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-14 21:35:50 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-14 21:41:31 +0100 |
| commit | 67e8392383d29c8dd4a7392bef33e0c16ac2297f (patch) | |
| tree | f039586d277183e3aeb3784efb24549056c43ee8 /pkgs/os-specific | |
| parent | 1a054480d312a40feba4f579eec3cd2d0db21280 (diff) | |
| parent | 799b941a2bb61970d6b99366bcf2062f1ce14328 (diff) | |
Merge #33057: stdenv meta checks: make them lazy
Closes #22277 - it's superseded; I have some WIP on evaluation performance, but best do that in a separate PR/thread.
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 0d2b7655edb93..b1df6c54c456b 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -134,10 +134,12 @@ let passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); }; - nativeDrv = lib.addPassthru kernel.nativeDrv passthru; + addPassthru' = lib.extendDerivation true passthru; - crossDrv = lib.addPassthru kernel.crossDrv passthru; + nativeDrv = addPassthru' kernel.nativeDrv; + + crossDrv = addPassthru' kernel.crossDrv; in if kernel ? crossDrv then nativeDrv // { inherit nativeDrv crossDrv; } - else lib.addPassthru kernel passthru + else addPassthru' kernel |