@@ -80,20 +80,19 @@ in rec {
8080 };
8181 };
8282
83− makeStartup = { target, nixUserChrootFlags, nix-user-chroot', run, initScript }:
83+ makeStartup = { target, nixUserChrootFlags, nix-user-chroot', run }:
8484 let
8585 # Avoid re-adding a store path into the store
8686 path = toStorePath target;
8787 in
8888 writeScript "startup" ''
8989 #!/bin/sh
90− ${initScript}
9190 .${nix-user-chroot'}/bin/nix-user-chroot -n ./nix ${nixUserChrootFlags} -- ${path}${run} "$@"
9291 '';
9392
94− nix-bootstrap = { target, extraTargets ? [], run, nix-user-chroot' ? nix-user-chroot, nixUserChrootFlags ? "", initScript ? "" }:
93+ nix-bootstrap = { target, extraTargets ? [], run, nix-user-chroot' ? nix-user-chroot, nixUserChrootFlags ? "" }:
9594 let
96− script = makeStartup { inherit target nixUserChrootFlags nix-user-chroot' run initScript; };
95+ script = makeStartup { inherit target nixUserChrootFlags nix-user-chroot' run; };
9796 in makebootstrap {
9897 startup = ".${script} '\"$@\"'";
9998 targets = [ "${script}" ] ++ extraTargets;
@@ -112,8 +111,8 @@ in rec {
112111 makeFlags = o.makeFlags ++ [
113112 ''ENV_PATH="${lib.makeBinPath targets}"''
114113 ];
115− }); in { target, extraTargets ? [], run, initScript ? "" }: nix-bootstrap {
116− inherit target extraTargets run initScript;
114+ }); in { target, extraTargets ? [], run }: nix-bootstrap {
115+ inherit target extraTargets run;
117116 nix-user-chroot' = nix-user-chroot'' extraTargets;
118117 };
119118}