mirror of
https://github.com/nix-community/disko
synced 2024-11-13 23:57:12 +00:00
diskoScript: add bash to PATH
This commit is contained in:
parent
8e50c6da0d
commit
1e7098ee04
2 changed files with 2 additions and 2 deletions
|
@ -36,7 +36,7 @@ in
|
||||||
'';
|
'';
|
||||||
disko = cfg: diskoLib.zapCreateMount (eval cfg).config.disko.devices;
|
disko = cfg: diskoLib.zapCreateMount (eval cfg).config.disko.devices;
|
||||||
diskoScript = cfg: pkgs: (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko-zap-create-mount" ''
|
diskoScript = cfg: pkgs: (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko-zap-create-mount" ''
|
||||||
export PATH=${lib.makeBinPath (diskoLib.packages (eval cfg).config.disko.devices pkgs)}:$PATH
|
export PATH=${lib.makeBinPath ((diskoLib.packages (eval cfg).config.disko.devices pkgs) ++ [ pkgs.bash ])}:$PATH
|
||||||
${diskoLib.zapCreateMount (eval cfg).config.disko.devices}
|
${diskoLib.zapCreateMount (eval cfg).config.disko.devices}
|
||||||
'';
|
'';
|
||||||
# we keep this old output for backwards compatibility
|
# we keep this old output for backwards compatibility
|
||||||
|
|
|
@ -51,7 +51,7 @@ in
|
||||||
system.build.disko = builtins.trace "the .disko output is deprecated, plase use .diskoScript instead" config.system.build.diskoScript;
|
system.build.disko = builtins.trace "the .disko output is deprecated, plase use .diskoScript instead" config.system.build.diskoScript;
|
||||||
|
|
||||||
system.build.diskoScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko" ''
|
system.build.diskoScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko" ''
|
||||||
export PATH=${lib.makeBinPath (diskoLib.packages cfg.devices pkgs)}:$PATH
|
export PATH=${lib.makeBinPath ((diskoLib.packages cfg.devices pkgs) ++ [ pkgs.bash ])}:$PATH
|
||||||
${diskoLib.zapCreateMount cfg.devices}
|
${diskoLib.zapCreateMount cfg.devices}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue