mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-22 14:45:27 +00:00
Adding a list-in-list checker for builderDefs closePropagation
svn path=/nixpkgs/branches/stdenv-updates/; revision=23608
This commit is contained in:
parent
52f4540026
commit
32071d5b4d
|
@ -215,11 +215,15 @@ rec {
|
|||
|
||||
|
||||
innerClosePropagation = ready: list: if list == [] then ready else
|
||||
innerClosePropagation
|
||||
(ready ++ [(head list)])
|
||||
((tail list)
|
||||
++ (maybeAttrNullable "propagatedBuildInputs" [] (head list))
|
||||
++ (maybeAttrNullable "propagatedBuildNativeInputs" [] (head list)));
|
||||
if ! isAttrs (head list) then
|
||||
builtins.trace ("not an attrSet: ${lib.showVal (head list)}")
|
||||
innerClosePropagation ready (tail list)
|
||||
else
|
||||
innerClosePropagation
|
||||
(ready ++ [(head list)])
|
||||
((tail list)
|
||||
++ (maybeAttrNullable "propagatedBuildInputs" [] (head list))
|
||||
++ (maybeAttrNullable "propagatedBuildNativeInputs" [] (head list)));
|
||||
|
||||
closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);});
|
||||
|
||||
|
|
Loading…
Reference in a new issue