From 4ac6cf68bb935f7bd1a0a8215f4d8b2c7a80d2ad Mon Sep 17 00:00:00 2001 From: guangtao Date: Mon, 19 Feb 2024 22:41:17 -0800 Subject: [PATCH] chore(lib): adjust order --- src/lib/omnibus/inputsToPaths.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/omnibus/inputsToPaths.nix b/src/lib/omnibus/inputsToPaths.nix index 26a18c8..49913a9 100644 --- a/src/lib/omnibus/inputsToPaths.nix +++ b/src/lib/omnibus/inputsToPaths.nix @@ -56,8 +56,10 @@ let extractAttrsFromInputs = inputs: l.pipe inputs [ - (l.filterAttrs (_: v: l.isAttrs v && (v ? sourceInfo.outPath || v ? outPath))) - (l.mapAttrs (_: v: v.sourceInfo.outPath or v.outPath or v.path)) + (l.filterAttrs ( + _: v: l.isAttrs v && (v ? sourceInfo.outPath || v ? outPath) && !v ? _type + )) + (l.mapAttrs (_: v: v.outPath or v.path or v.sourceInfo.outPath)) (l.mapAttrs ( _: v: if lib.strings.isStorePath v then getTopLevelPath (toString v) else [ ] ))