git.iko.soy/nix-bundle
on 0c6deae help sign in
e9fa7e8
swap
0 ahead, 4 behind
default.nix+8−10
since splitsnapshots
unifiedsplit
@@ -11,11 +11,10 @@ let
11 });
11 });
12in rec {
12in rec {
13 toStorePath = target:
13 toStorePath = target:
14− # If a store path has been given but is not a derivation, add the missing context
14+ # If a store path has been given but is a string, add the missing context
15 # to it so it will be propagated properly as a build input.
15 # to it so it will be propagated properly as a build input.
16− if !(lib.isDerivation target) && lib.isStorePath target then
16+ if builtins.isString target && lib.isStorePath target then
17− let path = toString target; in
18− builtins.appendContext path { "${path}" = { path = true; }; }
17+ builtins.appendContext target { "${target}" = { path = true; }; }
19 # Otherwise, add to the store. This takes care of appending the store path
18 # Otherwise, add to the store. This takes care of appending the store path
20 # in the context automatically.
19 # in the context automatically.
21 else "${target}";
20 else "${target}";
@@ -80,20 +79,19 @@ in rec {
80 };
79 };
81 };
80 };
82
81
83− makeStartup = { target, nixUserChrootFlags, nix-user-chroot', run, initScript }:
82+ makeStartup = { target, nixUserChrootFlags, nix-user-chroot', run }:
84 let
83 let
85 # Avoid re-adding a store path into the store
84 # Avoid re-adding a store path into the store
86 path = toStorePath target;
85 path = toStorePath target;
87 in
86 in
88 writeScript "startup" ''
87 writeScript "startup" ''
89 #!/bin/sh
88 #!/bin/sh
90− ${initScript}
91 .${nix-user-chroot'}/bin/nix-user-chroot -n ./nix ${nixUserChrootFlags} -- ${path}${run} "$@"
89 .${nix-user-chroot'}/bin/nix-user-chroot -n ./nix ${nixUserChrootFlags} -- ${path}${run} "$@"
92 '';
90 '';
93
91
94− nix-bootstrap = { target, extraTargets ? [], run, nix-user-chroot' ? nix-user-chroot, nixUserChrootFlags ? "", initScript ? "" }:
92+ nix-bootstrap = { target, extraTargets ? [], run, nix-user-chroot' ? nix-user-chroot, nixUserChrootFlags ? "" }:
95 let
93 let
96− script = makeStartup { inherit target nixUserChrootFlags nix-user-chroot' run initScript; };
94+ script = makeStartup { inherit target nixUserChrootFlags nix-user-chroot' run; };
97 in makebootstrap {
95 in makebootstrap {
98 startup = ".${script} '\"$@\"'";
96 startup = ".${script} '\"$@\"'";
99 targets = [ "${script}" ] ++ extraTargets;
97 targets = [ "${script}" ] ++ extraTargets;
@@ -112,8 +110,8 @@ in rec {
112 makeFlags = o.makeFlags ++ [
110 makeFlags = o.makeFlags ++ [
113 ''ENV_PATH="${lib.makeBinPath targets}"''
111 ''ENV_PATH="${lib.makeBinPath targets}"''
114 ];
112 ];
115− }); in { target, extraTargets ? [], run, initScript ? "" }: nix-bootstrap {
113+ }); in { target, extraTargets ? [], run }: nix-bootstrap {
116− inherit target extraTargets run initScript;
114+ inherit target extraTargets run;
117 nix-user-chroot' = nix-user-chroot'' extraTargets;
115 nix-user-chroot' = nix-user-chroot'' extraTargets;
118 };
116 };
119}
117}