Compare commits
2 Commits
28bbec1802
...
e8cae0558d
Author | SHA1 | Date | |
---|---|---|---|
e8cae0558d | |||
1ac296fea3 |
|
@ -26,7 +26,7 @@ stripSlash() {
|
||||||
for ((i = 0; i < ${#targets_[@]}; i++)); do
|
for ((i = 0; i < ${#targets_[@]}; i++)); do
|
||||||
stripSlash "${targets_[$i]}"
|
stripSlash "${targets_[$i]}"
|
||||||
mkdir -p "$(dirname "$res")"
|
mkdir -p "$(dirname "$res")"
|
||||||
cp -a "${sources_[$i]}" "$res"
|
cp -an "${sources_[$i]}" "$res"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,7 @@
|
||||||
in {
|
in {
|
||||||
genode.init.children.bash = let
|
genode.init.children.bash = let
|
||||||
extraErisInputs' = with pkgs.genodePackages; {
|
extraErisInputs' = with pkgs.genodePackages; {
|
||||||
bash =
|
bash = lib.getErisMainProgram (pkgs.bash // { pname = "bash"; });
|
||||||
lib.getErisMainProgram "bash" (pkgs.bash // { pname = "bash"; });
|
|
||||||
cached_fs_rom = lib.getErisMainProgram cached_fs_rom;
|
cached_fs_rom = lib.getErisMainProgram cached_fs_rom;
|
||||||
vfs = lib.getErisMainProgram vfs;
|
vfs = lib.getErisMainProgram vfs;
|
||||||
vfs_pipe = lib.getErisLib "vfs_pipe.lib.so" vfs_pipe;
|
vfs_pipe = lib.getErisLib "vfs_pipe.lib.so" vfs_pipe;
|
||||||
|
@ -22,7 +21,13 @@
|
||||||
package = pkgs.genodePackages.init;
|
package = pkgs.genodePackages.init;
|
||||||
extraErisInputs = builtins.attrValues extraErisInputs';
|
extraErisInputs = builtins.attrValues extraErisInputs';
|
||||||
configFile = pkgs.writeText "bash.child.dhall" ''
|
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 ];
|
extraInputs = with pkgs.genodePackages; [ pkgs.bash libc posix ];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user