From fc91521270df6b09f0e011f0f9475a8d4091c10a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 26 Aug 2023 11:45:58 +0200 Subject: [PATCH] refactor: writeFishApplication body --- overlays/builders.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/overlays/builders.nix b/overlays/builders.nix index 498ebcc..813b7d3 100644 --- a/overlays/builders.nix +++ b/overlays/builders.nix @@ -18,13 +18,11 @@ with final.lib; preferLocalBuild = false; text = '' #!${getExe final.fish} - '' + optionalString (runtimeInputs != [ ]) '' - export PATH="${makeBinPath runtimeInputs}:$PATH" - '' + '' + ${optionalString (runtimeInputs != [ ]) ''export PATH="${makeBinPath runtimeInputs}:$PATH"''} - ${content} - ''; + ${content} + ''; checkPhase = if checkPhase == null then '' @@ -35,9 +33,7 @@ with final.lib; else checkPhase; }; - script = fishFile "/bin/${name}" text; - completions_file = fishFile "/share/fish/vendor_completions.d/${name}.fish" completions; in final.symlinkJoin {