From b6f5b32eff33fb561e742b0f7b156e1bf954c6cb Mon Sep 17 00:00:00 2001 From: ene Date: Tue, 21 Mar 2023 16:33:23 +0100 Subject: Fix(lib): Add 'mktemp' as a default dependency This is fine because the shell-library depends on it. --- lib/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'lib') 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 = { -- cgit 1.4.1