remove reliance on PATH

replit · Aug 31, 2023 · 4c9c6c3 · 4c9c6c3
1 parent 80eddba
commit 4c9c6c3
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 19 deletions.
diff --git a/pkgs/modules/apl/default.nix b/pkgs/modules/apl/default.nix
@@ -19,7 +19,7 @@ in
     language = "APL";
     extensions = [ ".apl" ];
 
-    start = "apl -q --OFF --noCIN -f $file";
+    start = "${apl}/bin/apl -q --OFF --noCIN -f $file";
     fileParam = true;
   };
 }
diff --git a/pkgs/modules/bash/default.nix b/pkgs/modules/bash/default.nix
@@ -1,6 +1,8 @@
 { pkgs, ... }:
 
 let
+  bash = pkgs.bashInteractive;
+
   extensions = [ ".bash" ".sh" ];
 in
 
@@ -9,15 +11,15 @@ in
   name = "Bash";
 
   packages = [
-    pkgs.bashInteractive
+    bash
   ];
 
   replit.runners.bash = {
     name = "Bash";
     language = "bash";
     inherit extensions;
     fileParam = true;
-    start = "bash $file";
+    start = "${bash}/bin/bash $file";
   };
 
   replit.languageServers.bash-language-server = {

diff --git a/pkgs/modules/basic/default.nix b/pkgs/modules/basic/default.nix
@@ -2,7 +2,8 @@
 with pkgs;
 
 let
-  electron-runner = writeShellScriptBin "basic-runner-electron" ''
+  electron-runner-name = "basic-runner-electron";
+  electron-runner = writeShellScriptBin electron-runner-name ''
     ELECTRON_BASIC_TEMPLATE=''${BASIC_TEMPLATE:-${./template}}
     exec ${electron}/bin/electron --no-sandbox $ELECTRON_BASIC_TEMPLATE $@ 2>/dev/null
   '';
@@ -32,7 +33,7 @@ in
     name = "Basic on Electron";
     language = "basic";
     fileParam = true;
-    start = "basic-runner-electron --ps1 '${replit-prompt}' $file";
+    start = "${electron-runner}/bin/basic-runner-electron --ps1 '${replit-prompt}' $file";
   };
 
   replit.packagers.upmNodejs = {

diff --git a/pkgs/modules/brainfuck/default.nix b/pkgs/modules/brainfuck/default.nix
@@ -16,6 +16,6 @@ in
     name = "brainfuck";
     language = "brainfuck";
     optionalFileParam = true;
-    start = "yabi \${file:-main.bf} && echo";
+    start = "${brainfuck}/bin/yabi \${file:-main.bf} && echo";
   };
 }
diff --git a/pkgs/modules/c/default.nix b/pkgs/modules/c/default.nix
@@ -23,7 +23,7 @@ in
 
   replit.runners.clang-project = {
     name = "Clang: Project";
-    compile = "clang-compile main.c c all";
+    compile = "${clang-compile}/bin/clang-compile main.c c all";
     fileParam = false;
     language = "c";
     start = "./main.c.bin";

diff --git a/pkgs/modules/clojure/default.nix b/pkgs/modules/clojure/default.nix
@@ -16,7 +16,7 @@ in
     name = "Clojure";
     language = "clojure";
 
-    start = "clojure -M $file";
+    start = "${clojure}/bin/clojure -M $file";
     fileParam = true;
   };
 

diff --git a/pkgs/modules/cpp/default.nix b/pkgs/modules/cpp/default.nix
@@ -21,7 +21,7 @@ in
 
   replit.runners.clang-project = {
     name = "Clang++: Project";
-    compile = "clang-compile main.cpp cpp all";
+    compile = "${clang-compile}/bin/clang-compile main.cpp cpp all";
     fileParam = false;
     language = "cpp";
     start = "./main.cpp.bin";

diff --git a/pkgs/modules/crystal/default.nix b/pkgs/modules/crystal/default.nix
@@ -20,7 +20,7 @@ in
     language = "crystal";
     extensions = [ ".cr" ];
     fileParam = true;
-    start = "crystal run $file";
+    start = "${crystal}/bin/crystal run $file";
   };
 
   # TODO: nixpkgs crystalline

diff --git a/pkgs/modules/dart/default.nix b/pkgs/modules/dart/default.nix
@@ -13,7 +13,7 @@ in {
     name = "dart";
     language = "dart";
 
-    start = "dart main.dart";
+    start = "${dart}/bin/dart main.dart";
   };
 
   replit.languageServers.dart-pub = {

diff --git a/pkgs/modules/deno/default.nix b/pkgs/modules/deno/default.nix
@@ -32,13 +32,13 @@ in
     language = "javascript";
     inherit extensions;
     optionalFileParam = true;
-    start = "${deno-runner-name} $file";
+    start = "${deno-runner}/bin/${deno-runner-name} $file";
   };
 
   replit.languageServers.deno = {
     name = "deno";
     language = "javascript";
     inherit extensions;
-    start = "${pkgs.deno}/bin/deno lsp --quiet";
+    start = "${deno}/bin/deno lsp --quiet";
   };
 }
diff --git a/pkgs/modules/dotnet/default.nix b/pkgs/modules/dotnet/default.nix
@@ -20,7 +20,7 @@ in
     name = ".NET";
     language = "dotnet";
 
-    start = "dotnet run";
+    start = "${dotnet}/bin/dotnet run";
   };
 
   replit.languageServers.omni-sharp = {

diff --git a/pkgs/modules/elisp/default.nix b/pkgs/modules/elisp/default.nix
@@ -33,7 +33,7 @@ in
     language = "elisp";
     optionalFileParam = true;
     interpreter = true;
-    start = "${run-prybar-name} $file";
+    start = "${run-prybar}/bin/${run-prybar-name} $file";
   };
 
   replit.runners.elisp-script = {

diff --git a/pkgs/modules/elixir/default.nix b/pkgs/modules/elixir/default.nix
@@ -27,7 +27,7 @@ in
     language = "elixir";
     inherit extensions;
     fileParam = true;
-    start = "elixir $file";
+    start = "${elixir}/bin/elixir $file";
   };
 
   # TODO: LSP *and* DAP via pkgs.elixir-ls

diff --git a/pkgs/modules/emoticon/default.nix b/pkgs/modules/emoticon/default.nix
@@ -26,6 +26,6 @@ in
     language = "emoticon";
     interpreter = true;
     fileParam = true;
-    start = "${run-replbox-name} $file";
+    start = "${run-replbox}/bin/${run-replbox-name} $file";
   };
 }
diff --git a/pkgs/modules/erlang/default.nix b/pkgs/modules/erlang/default.nix
@@ -22,8 +22,8 @@ in
     language = "erlang";
     inherit extensions;
     fileParam = true;
-    compile = "erlc -o $REPL_HOME/.build $file";
-    start = "erl -noshell";
+    compile = "${erlang}/bin/erlc -o $REPL_HOME/.build $file";
+    start = "${erlang}/bin/erl -noshell";
   };
 
   # TODO: LSP via pkgs.erlang-ls