ehmry/sigil
ehmry
/
sigil
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fix use of lib.getErisMainProgram in Bash test

This commit is contained in:
Ehmry - 2023-04-28 13:22:54 +01:00
parent 28bbec1802
commit 1ac296fea3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/bash.nix
View File

@ -5,8 +5,7 @@
in {
genode.init.children.bash = let
extraErisInputs' = with pkgs.genodePackages; {
bash =
lib.getErisMainProgram "bash" (pkgs.bash // { pname = "bash"; });
bash = lib.getErisMainProgram (pkgs.bash // { pname = "bash"; });
cached_fs_rom = lib.getErisMainProgram cached_fs_rom;
vfs = lib.getErisMainProgram vfs;
vfs_pipe = lib.getErisLib "vfs_pipe.lib.so" vfs_pipe;
@ -22,7 +21,13 @@
package = pkgs.genodePackages.init;
extraErisInputs = builtins.attrValues extraErisInputs';
configFile = pkgs.writeText "bash.child.dhall" ''
${./bash.dhall} ${toDhall params}
${./bash.dhall} {
, bash = "${pkgs.bash}"
, coreutils = "${pkgs.coreutils}"
, cached_fs_rom = ${extraErisInputs'.cached_fs_rom.cap}
, vfs = ${extraErisInputs'.vfs.cap}
, vfs_pipe = ${extraErisInputs'.vfs_pipe.cap}
}
'';
extraInputs = with pkgs.genodePackages; [ pkgs.bash libc posix ];
};