lib.mkDevShell: escape environment variable values

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/mk-dev-shell.nix b/lib/mk-dev-shell.nix
index e0bb441..8078f35 100644
--- a/lib/mk-dev-shell.nix
+++ b/lib/mk-dev-shell.nix
@@ -4,8 +4,10 @@
 }:
 
 let
-  # TODO: escape values properly
-  exportEnvVar = k: v: ''export ${k}="${v}"; echo ${k}=\"${v}\"'';
+  exportEnvVar = k: v: with pkgs.lib; ''
+    export ${escapeShellArg k}=${escapeShellArg v}
+    echo ${escapeShellArg k}=${escapeShellArg v}
+  '';
   exportedEnvVars = pkgs.lib.mapAttrsToList exportEnvVar envVars;
 
 in pkgs.mkShell {