status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

nix: add support for more build inputs in mergeSh 

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2020-05-15 12:19:07 +02:00
parent 73a8992db7
commit 64b8b9f170
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nix/lib/mergeSh.nix
View File

@ -1,9 +1,20 @@
# this is an utility for mergeing shells created with mkShell # this is an utility for mergeing shells created with mkShell
# TODO: make this an attribute of mkShell result set. # TODO: make this an attribute of mkShell result set. Or just use inputsFrom.
{ lib }: { lib }:
super: shells: super.overrideAttrs(super: with lib; { super: shells:
inputsFrom = (super.inputsFrom or []) ++ unique (catAttrs "inputsFrom" shells); super.overrideAttrs (super:
buildInputs = (super.buildInputs or []) ++ unique (catAttrs "buildInputs" shells); let
shellHook = (super.shellHook or "") + concatStrings (catAttrs "shellHook" shells); inherit (lib) attrByPath unique catAttrs concatStrings;
})
mergeAttrsFor = attrName:
(attrByPath [attrName] [] super) ++ unique (catAttrs attrName shells);
in {
inputsFrom = mergeAttrsFor "inputsFrom";
buildInputs = mergeAttrsFor "buildInputs";
nativeBuildInputs = mergeAttrsFor "nativeBuildInputs";
propagatedBuildInputs = mergeAttrsFor "propagatedBuildInputs";
propagatedNativeBuildInputs = mergeAttrsFor "propagatedNativeBuildInputs";
# shellHook is a string, not a list
shellHook = (super.shellHook or "") + concatStrings (catAttrs "shellHook" shells);
})