aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorene <ene@sils.li>2023-03-21 16:33:23 +0100
committerene <ene@sils.li>2023-03-21 16:33:23 +0100
commitb6f5b32eff33fb561e742b0f7b156e1bf954c6cb (patch)
treea4295a1f13e00450f0eefa576bef0c669d12cd1d
parentFix(bootstrap/install): Add btrfs-progs as dependency (diff)
downloadnixos-config-b6f5b32eff33fb561e742b0f7b156e1bf954c6cb.zip
Fix(lib): Add 'mktemp' as a default dependency
This is fine because the shell-library depends on it.
-rw-r--r--lib/default.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/default.nix b/lib/default.nix
index 20088dc4..38301ea0 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -2,20 +2,25 @@
pkgs,
shell-library,
...
-}: {
+}: let
+ shellLibraryDeps =
+ builtins.attrValues {inherit (pkgs) mktemp;};
+in {
makeShellScriptWithLibrary = {
dependencies,
name,
script,
...
- }:
+ }: let
+ shellDependencies = dependencies ++ shellLibraryDeps;
+ in
pkgs.runCommandLocal name {
- nativeBuildInputs = [pkgs.makeWrapper] ++ dependencies;
+ nativeBuildInputs = [pkgs.makeWrapper] ++ shellDependencies;
} ''
install -m755 ${script} -D "$out/bin/${name}"
sed -i 's|%SHELL_LIBRARY_PATH|${shell-library}/lib|' "$out/bin/${name}"
patchShebangs "$out/bin/${name}"
- wrapProgram "$out/bin/${name}" --set PATH ${pkgs.lib.makeBinPath dependencies}
+ wrapProgram "$out/bin/${name}" --set PATH ${pkgs.lib.makeBinPath shellDependencies}
'';
makeShellScriptWithLibraryUnwrapped = {