harald/nixsgx
1
0
Fork 0
mirror of https://github.com/matter-labs/nixsgx.git synced 2025-07-21 23:43:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: use lib.recursiveUpdate by default

Browse source 
the custom `recursiveMerge` function was not working as expected.

Signed-off-by: Harald Hoyer <harald@matterlabs.dev>
This commit is contained in:
Harald Hoyer 2024-06-05 14:16:11 +02:00
parent b6e9f1e229
commit a969fffac9
Signed by: harald
GPG key ID: F519A1143B3FBE32
1 changed files with 1 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/default.nix
View file

@ -27,22 +27,6 @@ _:
}:
assert lib.assertMsg (!(isAzure && sgx_default_qcnl_conf != null)) "sgx_default_qcnl_conf can't be set for Azure";
let
recursiveMerge = attrList:
with lib;
let
f = attrPath:
zipAttrsWith (n: values:
if tail values == [ ]
then head values
else if all isList values
then unique (concatLists values)
else if all isAttrs values
then f (attrPath ++ [ n ]) values
else last values
);
in
f [ ] attrList;
manifest_base = {
libos = { inherit entrypoint; };
fs = {
@ -93,9 +77,7 @@ _:
};
};
mergedManifest = ((if customRecursiveMerge == null then recursiveMerge else customRecursiveMerge) [ manifest_base manifest ])
# Don't merge the `loader.argv` array
// { loader.argv = lib.attrsets.attrByPath [ "loader" "argv" ] manifest_base.loader.argv manifest; };
mergedManifest = (if customRecursiveMerge == null then lib.recursiveUpdate else customRecursiveMerge) manifest_base manifest;
tomlFormat = pkgs.formats.toml { };
manifestFile = tomlFormat.generate "${name}.manifest.toml" mergedManifest;