From 1e7098ee0448dc5d33df394d040f454cd42a809c Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 23 Jun 2023 04:58:08 +0200 Subject: [PATCH] diskoScript: add bash to PATH --- default.nix | 2 +- module.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 8f17c65..0e958dd 100644 --- a/default.nix +++ b/default.nix @@ -36,7 +36,7 @@ in ''; disko = cfg: diskoLib.zapCreateMount (eval cfg).config.disko.devices; 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} ''; # we keep this old output for backwards compatibility diff --git a/module.nix b/module.nix index 795900d..f9b9c23 100644 --- a/module.nix +++ b/module.nix @@ -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.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} '';