about summary refs log tree commit diff
path: root/nix/writeExecline/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nix/writeExecline/default.nix')
-rw-r--r--nix/writeExecline/default.nix32
1 files changed, 2 insertions, 30 deletions
diff --git a/nix/writeExecline/default.nix b/nix/writeExecline/default.nix
index 0916e2d58eac..49bc416094a3 100644
--- a/nix/writeExecline/default.nix
+++ b/nix/writeExecline/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, depot, ... }:
 
 # Write an execline script, represented as nested nix lists.
 # Everything is escaped correctly.
@@ -6,34 +6,6 @@
 
 # TODO(Profpatsch) upstream into nixpkgs
 
-let
-  # replaces " and \ to \" and \\ respectively and quote with "
-  # e.g.
-  #   a"b\c -> "a\"b\\c"
-  #   a\"bc -> "a\\\"bc"
-  escapeExeclineArg = arg:
-    ''"${builtins.replaceStrings [ ''"'' ''\'' ] [ ''\"'' ''\\'' ] (toString arg)}"'';
-
-  # Escapes an execline (list of execline strings) to be passed to execlineb
-  # Give it a nested list of strings. Nested lists are interpolated as execline
-  # blocks ({}).
-  # Everything is quoted correctly.
-  #
-  # Example:
-  #   escapeExecline [ "if" [ "somecommand" ] "true" ]
-  #   == ''"if" { "somecommand" } "true"''
-  escapeExecline = execlineList: lib.concatStringsSep " "
-    (let
-      go = arg:
-        if      builtins.isString arg then [(escapeExeclineArg arg)]
-        else if builtins.isPath arg then [(escapeExeclineArg "${arg}")]
-        else if lib.isDerivation arg then [(escapeExeclineArg arg)]
-        else if builtins.isList arg then [ "{" ] ++ builtins.concatMap go arg ++ [ "}" ]
-        else abort "escapeExecline can only hande nested lists of strings, was ${lib.generators.toPretty {} arg}";
-     in builtins.concatMap go execlineList);
-
-in
-
 name:
 {
   # "var": substitute readNArgs variables and start $@
@@ -63,5 +35,5 @@ in
   # TODO(Profpatsch): rewrite `writeScript` with `runExecline`
   pkgs.writeScript name ''
     #!${pkgs.execline}/bin/execlineb -W${env}
-    ${escapeExecline argList}
+    ${depot.nix.escapeExecline argList}
   ''