File tree Expand file tree Collapse file tree 1 file changed +5
-6
lines changed Expand file tree Collapse file tree 1 file changed +5
-6
lines changed Original file line number Diff line number Diff line change 95
95
#
96
96
# Also, we take care to keep duplicates out of the list, otherwise we may see
97
97
# "Argument list too long" errors from bash when entering a shell.
98
- addUnique = new : existing :
99
- lib . lists . foldr ( x : acc : if lib . lists . any ( y : x == y ) acc then acc else [ x ] ++ acc ) existing new ;
100
- concatSystemInputs = inputsSoFar : c :
101
- addUnique c . buildInputs ( addUnique c . propagatedBuildInputs inputsSoFar ) ;
102
- systemInputs' = lib . lists . foldl concatSystemInputs [ ] selectedComponents ;
103
- systemInputs = removeSelectedInputs systemInputs' ;
98
+ uniqueInputs = inputList : builtins . listToAttrs ( builtins . map ( x : lib . nameValuePair ( x . name ) x ) inputList ) ;
99
+ unionComponentInputs = inputsSoFar : c :
100
+ inputsSoFar // uniqueInputs c . buildInputs // uniqueInputs c . propagatedBuildInputs ;
101
+ systemInputs' = lib . lists . foldl unionComponentInputs { } selectedComponents ;
102
+ systemInputs = removeSelectedInputs ( builtins . attrValues systemInputs' ) ;
104
103
105
104
nativeBuildInputs = removeSelectedInputs
106
105
( lib . concatMap ( c : c . executableToolDepends ) selectedComponents ) ;
You can’t perform that action at this time.
0 commit comments